Merge branch 'master' into travis-updates
update travis file
cm
update
Merge branch 'travis-updates'