Merged revisions 291469 via svnmerge from