Sync'd branch integration/b2g-inbound with upstream @ Thu Nov  6 17:08:52 PST 2014