Merged latest Mozilla Nightly