travis-ci settings
Merge branch 'support-travis' into mine-master