SVN roll-up patch
This is a roll-up patch containing all the changes from the 1.24.0 release to the current SVN version.