Issue #87. Moztrap #5933

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