Merge branch 'master' into uat live-2014-07-07 uat-2014-07-07
authorIain Patterson <me@iain.cx>
Mon, 7 Jul 2014 09:09:20 +0000 (05:09 -0400)
committerIain Patterson <me@iain.cx>
Mon, 7 Jul 2014 09:09:20 +0000 (05:09 -0400)

Trivial merge