Sync'd branch integration/b2g-inbound with upstream @ Tue Nov  4 18:33:47 PST 2014