Merged revisions 10577 via svnmerge from