Merge branch 'master' into uat live-2013-06-25 uat-2013-06-25
authorIain Patterson <me@iain.cx>
Tue, 25 Jun 2013 10:32:27 +0000 (06:32 -0400)
committerIain Patterson <me@iain.cx>
Tue, 25 Jun 2013 10:32:27 +0000 (06:32 -0400)

Trivial merge