Merge branch 'master' of github.com:systemed/potlatch2 master
authorRichard Fairhurst <richard@systemeD.net>
Fri, 21 Jun 2019 09:03:25 +0000 (10:03 +0100)
committerRichard Fairhurst <richard@systemeD.net>
Fri, 21 Jun 2019 09:03:25 +0000 (10:03 +0100)

Trivial merge