fix travis
Merge branch 'develop' into bitdewy/master