Merge branch 'master' into staging
authorIan Jackson <ijackson@chiark.greenend.org.uk>
Fri, 31 Jan 2014 11:21:55 +0000 (11:21 +0000)
committerIan Jackson <ijackson@chiark.greenend.org.uk>
Fri, 31 Jan 2014 11:21:55 +0000 (11:21 +0000)

Trivial merge