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