Merged revisions 4003-4037 via svnmerge from