Merged revisions 45408 via svnmerge from