Backed out changeset 5dc41a3d8d77 (bug 968647)
Backed out changeset fad708985071 (bug 968647)
Backed out changeset d06ee3f1e9a3 (bug 968647)
Automatic merge