Merge branch 'master' into uat live-2016-03-29 uat-2016-03-29
authorIain Patterson <me@iain.cx>
Tue, 29 Mar 2016 16:09:26 +0000 (12:09 -0400)
committerIain Patterson <me@iain.cx>
Tue, 29 Mar 2016 16:09:26 +0000 (12:09 -0400)

Trivial merge