* Fixed travis build
Merge branch 'hotfix/6.1.1'

* hotfix/6.1.1:
  * Fixed travis build