Changes from hotsauce tag [travis-push-1]