Merge branch 'master' of github.com:systemed/potlatch2
authorRichard Fairhurst <richard@systemeD.net>
Wed, 6 Jun 2018 10:15:45 +0000 (11:15 +0100)
committerRichard Fairhurst <richard@systemeD.net>
Wed, 6 Jun 2018 10:15:45 +0000 (11:15 +0100)

Trivial merge