* Fixed travis config
Merge branch 'hotfix/10.1.4'

* hotfix/10.1.4:
  * Fixed travis config
fixed conflicts