Sync'd branch integration/b2g-inbound with upstream @ Tue Nov 11 21:39:10 PST 2014