Sync'd branch integration/b2g-inbound with upstream @ Tue Nov  4 20:40:43 PST 2014