Merged revisions 356215 via svnmerge from