Merge branch 'release/1.0'
Merge branch 'release/1.1'
- Fixed config issue
Merge branch 'hotfix/fix-travis-config' into develop