Merge branch 'master' into uat uat-2013-05-13
authorIain Patterson <me@iain.cx>
Mon, 13 May 2013 13:01:47 +0000 (09:01 -0400)
committerIain Patterson <me@iain.cx>
Mon, 13 May 2013 13:01:47 +0000 (09:01 -0400)

Trivial merge