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