Merged revisions 36697 via svnmerge from