Added fix for travis rbx
Merge branch 'master' into dev