Merge tag 'v0.42'
authorBjørn Erik Pedersen <bjorn.erik.pedersen@gmail.com>
Tue, 12 Jun 2018 06:42:25 +0000 (08:42 +0200)
committerBjørn Erik Pedersen <bjorn.erik.pedersen@gmail.com>
Tue, 12 Jun 2018 06:42:25 +0000 (08:42 +0200)
releaser: 0.42 [ci skip]


Trivial merge