Merged revisions 291038 via svnmerge from