Sync'd branch integration/b2g-inbound with upstream @ Wed Nov 12 06:39:02 PST 2014