Merge branch 'master' into uat live-2013-07-10 uat-2013-07-10
authorIain Patterson <me@iain.cx>
Wed, 10 Jul 2013 14:19:13 +0000 (10:19 -0400)
committerIain Patterson <me@iain.cx>
Wed, 10 Jul 2013 14:19:13 +0000 (10:19 -0400)

Trivial merge