Sync'd branch integration/b2g-inbound with upstream @ Thu Nov  6 11:30:00 PST 2014