Fix for Ruby noise in Travis.

Signed-off-by: Mloc <colmohici@gmail.com>
Merge remote-tracking branch 'upstream/master' into dev-freeze
Merge remote-tracking branch 'upstream/dev-freeze' into dev