bug 984214 - release merge day. r=hwine