release 2.4.0
Merge pull request #9185 from trawor/fork

release 2.4.0