Merged revisions 45678 via svnmerge from