Merge from upstream/3.7#606

Merged

JulienPalard merged 5 commits intopython:3.7from

Seluj78:upstream-merge

Mar 20, 2019

Commits on Mar 11, 2019

Commits on Mar 17, 2019

Apply suggestions from code review
Seluj78
authored

Commits on Mar 18, 2019