Merged revisions 152215 via svnmerge from