Merge branch 'master' into uat uat-2015-03-12
authorIain Patterson <me@iain.cx>
Thu, 12 Mar 2015 16:43:01 +0000 (12:43 -0400)
committerIain Patterson <me@iain.cx>
Thu, 12 Mar 2015 16:43:01 +0000 (12:43 -0400)

Trivial merge