Merged revisions 157503 via svnmerge from