Merged revisions 145479 via svnmerge from