Merge branch 'release-0.36.1'
authorBjørn Erik Pedersen <bjorn.erik.pedersen@gmail.com>
Thu, 15 Feb 2018 09:13:09 +0000 (10:13 +0100)
committerBjørn Erik Pedersen <bjorn.erik.pedersen@gmail.com>
Thu, 15 Feb 2018 09:13:09 +0000 (10:13 +0100)

Trivial merge