Merged revisions 157305 via svnmerge from