Merge branch 'master' into uat uat-2013-09-24
authorIain Patterson <me@iain.cx>
Tue, 24 Sep 2013 08:16:19 +0000 (04:16 -0400)
committerIain Patterson <me@iain.cx>
Tue, 24 Sep 2013 08:16:19 +0000 (04:16 -0400)

Trivial merge