Merge proposals dependent on lp://staging/~sil/appofjaq/comments

lp://staging/~sil/appofjaq/comments has no merge proposals.