Bug1054461

Supercedes https://github.com/mozilla/kuma/pull/2772