Sync'd branch integration/b2g-inbound with upstream @ Wed Nov 12 22:14:01 PST 2014