Sync'd branch integration/b2g-inbound with upstream @ Mon Nov  3 11:11:57 PST 2014