Import with_statement for old Python versions
Merge pull request #1975 from dpwatrous/develop

Import with_statement for old Python versions