Merged revisions 317196 via svnmerge from