Merged revisions 174369 via svnmerge from