Merged changes made for version 4.1.20 onto the trunk