Merge remote-tracking branch 'remotes/origin/master'
authorJonathan Dieter <jdieter@gmail.com>
Mon, 30 Jul 2018 16:59:19 +0000 (17:59 +0100)
committerJonathan Dieter <jdieter@gmail.com>
Mon, 30 Jul 2018 16:59:19 +0000 (17:59 +0100)

Trivial merge