Merged revisions 291581 via svnmerge from