Merged revisions 158071 via svnmerge from