Merge commit 'a215abf70e018f4bf40d6c09d8bd148d8684b33d'
authorBjørn Erik Pedersen <bjorn.erik.pedersen@gmail.com>
Sun, 22 Apr 2018 15:57:24 +0000 (17:57 +0200)
committerBjørn Erik Pedersen <bjorn.erik.pedersen@gmail.com>
Sun, 22 Apr 2018 15:57:24 +0000 (17:57 +0200)

Trivial merge