Travis build 2240 pushed to master