Merged revisions 158539 via svnmerge from