Merge branch 'master' into uat uat-2018-07-09
authorIain Patterson <me@iain.cx>
Mon, 9 Jul 2018 08:56:26 +0000 (04:56 -0400)
committerIain Patterson <me@iain.cx>
Mon, 9 Jul 2018 08:56:26 +0000 (04:56 -0400)

Trivial merge