Merge branch 'master' into uat
authorIain Patterson <me@iain.cx>
Thu, 7 Apr 2016 15:34:21 +0000 (11:34 -0400)
committerIain Patterson <me@iain.cx>
Thu, 7 Apr 2016 15:34:21 +0000 (11:34 -0400)

Trivial merge