Sync'd branch integration/b2g-inbound with upstream @ Tue Nov 11 05:24:57 PST 2014