Merge branch 'release/2.4.0.rc4-1' into develop
Merge branch 'master' into develop
Configure for TravisCI and Coverall