Merge branch 'master' into uat uat-2016-04-05
authorIain Patterson <me@iain.cx>
Tue, 5 Apr 2016 10:18:15 +0000 (06:18 -0400)
committerIain Patterson <me@iain.cx>
Tue, 5 Apr 2016 10:18:15 +0000 (06:18 -0400)

Trivial merge