Merge branch 'release-0.40.3'
authorBjørn Erik Pedersen <bjorn.erik.pedersen@gmail.com>
Wed, 9 May 2018 07:54:25 +0000 (09:54 +0200)
committerBjørn Erik Pedersen <bjorn.erik.pedersen@gmail.com>
Wed, 9 May 2018 07:54:25 +0000 (09:54 +0200)

Trivial merge