Bug 846360-namespace modified
Merge https://github.com/Keops92/mozilla-central