Merge branch 'hotfix/10.1.4'

* hotfix/10.1.4:
  * Fixed travis config
* Fixed index
Merge branch 'hotfix/10.1.5' into develop

* hotfix/10.1.5:
  * Fixed index