Merged revisions 319469 via svnmerge from