Travis build 3170 pushed to master