travis support
Merge branch 'release/1.1.1' into develop