Sync'd branch integration/b2g-inbound with upstream @ Mon Nov  3 20:33:44 PST 2014