Backed out changeset 508848ad378a (bug 939562) for causing bug 978450
Merge mozilla-central and b2g-inbound