Issue #87. Moztrap #5932

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