Adopting Dmirtiy's Travis build changes