Sync'd branch integration/b2g-inbound with upstream @ Wed Nov  5 23:34:46 PST 2014