Merged revisions 291541 via svnmerge from