Merged revisions 246545 via svnmerge from