upgrading to 2.4.1
Merge branch '2-4-stable'