Merged revisions 290542 via svnmerge from