Merged revisions 36253-36254 via svnmerge from