Trying a direct master checkin (yuck) to try and kick travis-ci