Travis build 2340 pushed to master