Merge branch 'master' into uat uat-2013-10-03
authorIain Patterson <me@iain.cx>
Thu, 3 Oct 2013 07:53:55 +0000 (03:53 -0400)
committerIain Patterson <me@iain.cx>
Thu, 3 Oct 2013 07:53:55 +0000 (03:53 -0400)

Trivial merge