Minor fix
Merge branch 'travis-conf' into develop