Sync'd branch integration/b2g-inbound with upstream @ Thu Nov  6 13:14:46 PST 2014