Sync'd branch integration/b2g-inbound with upstream @ Thu Nov  6 07:26:16 PST 2014