Merged revisions 291394 via svnmerge from