Merged revisions 291575 via svnmerge from