Preparing release 2.4
Back to development: 2.5
Merge remote-tracking branch 'upstream/master'