Merged revisions 290829 via svnmerge from