Merged revisions 157104 via svnmerge from