Merged revisions 36377 via svnmerge from