Sync'd branch integration/b2g-inbound with upstream @ Thu Nov  6 15:39:19 PST 2014