(moved from [zamboni/pull/1788](https://github.com/mozilla/zamboni/pull/1788))

bug [750906](https://bugzilla.mozilla.org/show_bug.cgi?id=750906)

This PR is based on the PR #1752, as it's the follow-up of bug 750904.