Bug 1051655: fix error thrown when users without editbugs comment on
bugs
Merge branch 'master' into production