Merged revisions 156289 via svnmerge from