Merged revisions 199626,199628 via svnmerge from