Travis build 3158 pushed to master