travis base support
Merge branch 'devel'