Merged revisions 113504 via svnmerge from