Merge branch 'master' into uat live-2013-05-15 uat-2013-05-15
authorIain Patterson <me@iain.cx>
Wed, 15 May 2013 14:35:38 +0000 (10:35 -0400)
committerIain Patterson <me@iain.cx>
Wed, 15 May 2013 14:35:38 +0000 (10:35 -0400)

Trivial merge