Sync'd branch integration/b2g-inbound with upstream @ Tue Nov  4 12:23:34 PST 2014