Backport changes from 3.6#1966

slozier merged 2 commits intoIronLanguages:mainIronLanguages/ironpython3:mainfrom

slozier:from_36slozier/ironpython3:from_36Copy head branch name to clipboard