Merged revisions 290506 via svnmerge from