Merge branch 'master' into uat live-2013-10-15 uat-2013-10-15
authorIain Patterson <me@iain.cx>
Tue, 15 Oct 2013 09:27:36 +0000 (05:27 -0400)
committerIain Patterson <me@iain.cx>
Tue, 15 Oct 2013 09:27:36 +0000 (05:27 -0400)

Trivial merge