Merge branch 'master' into uat uat-2018-06-21
authorIain Patterson <me@iain.cx>
Thu, 21 Jun 2018 21:31:53 +0000 (17:31 -0400)
committerIain Patterson <me@iain.cx>
Thu, 21 Jun 2018 21:31:53 +0000 (17:31 -0400)

Trivial merge