Release 2.4.0
Merge branch 'master' into develop