Merged revisions 245944 via svnmerge from