Merge branch 'ready/comments'
authorSimon McVittie <smcv@debian.org>
Fri, 12 Sep 2014 20:40:24 +0000 (21:40 +0100)
committerSimon McVittie <smcv@debian.org>
Fri, 12 Sep 2014 20:40:24 +0000 (21:40 +0100)

Trivial merge