Merge branch 'master' into uat live-2013-12-12 uat-2013-12-12
authorIain Patterson <me@iain.cx>
Thu, 12 Dec 2013 18:17:34 +0000 (13:17 -0500)
committerIain Patterson <me@iain.cx>
Thu, 12 Dec 2013 18:17:34 +0000 (13:17 -0500)

Trivial merge