Fix travis
Merge branch 'master' into project_update