Merge 3.7 to master to fix build#4

raulcd merged 16 commits intomasterpython/python-docs-es:masterfrom

3.7python/python-docs-es:3.7Copy head branch name to clipboard