Merge branch 'master' into uat live-2016-04-08 uat-2016-04-08
authorIain Patterson <me@iain.cx>
Fri, 8 Apr 2016 12:03:39 +0000 (08:03 -0400)
committerIain Patterson <me@iain.cx>
Fri, 8 Apr 2016 12:03:39 +0000 (08:03 -0400)

Trivial merge