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