Merge branch 'release-0.42.2'
authorBjørn Erik Pedersen <bjorn.erik.pedersen@gmail.com>
Thu, 28 Jun 2018 12:40:23 +0000 (14:40 +0200)
committerBjørn Erik Pedersen <bjorn.erik.pedersen@gmail.com>
Thu, 28 Jun 2018 12:40:23 +0000 (14:40 +0200)

Trivial merge