Merge branch 'master' into uat uat-2014-04-12
authorIain Patterson <me@iain.cx>
Sat, 12 Apr 2014 19:58:54 +0000 (15:58 -0400)
committerIain Patterson <me@iain.cx>
Sat, 12 Apr 2014 19:58:54 +0000 (15:58 -0400)

Trivial merge