Merge branch 'master' into uat live-2013-09-11 uat-2013-09-11
authorIain Patterson <me@iain.cx>
Wed, 11 Sep 2013 14:57:54 +0000 (10:57 -0400)
committerIain Patterson <me@iain.cx>
Wed, 11 Sep 2013 14:57:54 +0000 (10:57 -0400)

Trivial merge