travis-ready
merge