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

Trivial merge