Fixed Travis Build
Merge branch 'hotfix/FixTravisBuildErrors'
Merge tag 'FixTravisBuildErrors' into develop

Fixed failing Travis builds