Merged revisions 120425 via svnmerge from