Merged revisions 123485 via svnmerge from