Sync'd branch integration/b2g-inbound with upstream @ Sun Nov  9 06:30:39 PST 2014