Merged revisions 114603 via svnmerge from