Cherrypick bug 886329 to Aurora/Firefox25