Merged revisions 170504 via svnmerge from