Backed out australis changeset 5a8d6a009942 (bug 935815) for frequent oranges on a CLOSED TREE
Merge mozilla-central to fx-team  on a CLOSED TREE