Merge branch 'master' into uat live-2013-10-31 uat-2013-10-31
authorIain Patterson <me@iain.cx>
Thu, 31 Oct 2013 16:50:05 +0000 (12:50 -0400)
committerIain Patterson <me@iain.cx>
Thu, 31 Oct 2013 16:50:05 +0000 (12:50 -0400)

Trivial merge