Merged revisions 120226 via svnmerge from