Merged revisions 67156 via svnmerge from