Merge tag 'v0.41'
authorBjørn Erik Pedersen <bjorn.erik.pedersen@gmail.com>
Fri, 25 May 2018 17:07:52 +0000 (19:07 +0200)
committerBjørn Erik Pedersen <bjorn.erik.pedersen@gmail.com>
Fri, 25 May 2018 17:07:52 +0000 (19:07 +0200)
releaser: 0.41 [ci skip]


Trivial merge