Backed out changeset e6a9c98d62d0 (bug 927196) for causing bug 939269
Merge mozilla-central and inbound