travis error reporting fix
Merge branch 'dev'