updated CHANGELOG.txt, ready for release 2.4.0
Merge branch 'rb2.4.0'