Merged revisions 45928 via svnmerge from