Add pty= kwarg to upload_template, fixes #1082
Add integration test re #1082
We do not support Python 3 yet
We do not support Python 3 yet
We do not support Python 3 yet
Merge branch '1.7' into 1.8
Merge branch '1.8'