Backed out changeset 4b2db2286258 (bug 870238)
Backed out changeset 83fd85b082d1 (bug 1009679) for crashtest and reftest failures; CLOSED TREE
Merge inbound to m-c