Bug 1045488 - esr31 branch on https://github.com/mozilla/gecko-dev,r=hwine