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