Update from mozilla-inbound, bug fixes, rebasing.