Merge branch 'master' into uat live-2017-11-21
authorIain Patterson <me@iain.cx>
Tue, 21 Nov 2017 14:35:02 +0000 (09:35 -0500)
committerIain Patterson <me@iain.cx>
Tue, 21 Nov 2017 14:35:02 +0000 (09:35 -0500)

Trivial merge