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