Backed out changeset 8ab0a696d2ec (bug 978456) since bug 939562 has now been backed out
Automatic merge