2.4dev merged into master

This is the official merge into master of 2.4dev