Merge branch 'master' into uat live-2013-11-07 uat-2013-11-07
authorIain Patterson <me@iain.cx>
Thu, 7 Nov 2013 16:36:17 +0000 (11:36 -0500)
committerIain Patterson <me@iain.cx>
Thu, 7 Nov 2013 16:36:17 +0000 (11:36 -0500)

Trivial merge