Travis build 2040 pushed to master