Add missing with_statement imports (issue 3751)
Merge pull request #2012 from skirpichev/3751-with-import

Add missing with_statement imports (issue 3751)