Merge branch 'master' into uat uat-2018-09-03
authorIain Patterson <me@iain.cx>
Mon, 3 Sep 2018 09:44:05 +0000 (05:44 -0400)
committerIain Patterson <me@iain.cx>
Mon, 3 Sep 2018 09:44:05 +0000 (05:44 -0400)

Trivial merge