Partial fix for CP21478.
Merge branch 'ipy-2.7-maint' of github.com:IronLanguages/main into ipy-2.7-maint