Issue #87. Moztrap #5936

https://moztrap.mozilla.org/manage/case/5936/