Merge branch 'master' into uat live-2014-04-14 uat-2014-04-14
authorIain Patterson <me@iain.cx>
Mon, 14 Apr 2014 13:26:41 +0000 (09:26 -0400)
committerIain Patterson <me@iain.cx>
Mon, 14 Apr 2014 13:26:41 +0000 (09:26 -0400)

Trivial merge