Merge branch 'release-0.49.2'
authorBjørn Erik Pedersen <bjorn.erik.pedersen@gmail.com>
Thu, 11 Oct 2018 10:01:51 +0000 (12:01 +0200)
committerBjørn Erik Pedersen <bjorn.erik.pedersen@gmail.com>
Thu, 11 Oct 2018 10:01:51 +0000 (12:01 +0200)

Trivial merge