Sync'd branch integration/b2g-inbound with upstream @ Mon Nov  3 01:03:49 PST 2014