Imported Upstream version 1.7.0
Merge tag 'upstream/1.7.0'

Upstream version 1.7.0

* tag 'upstream/1.7.0':
  Imported Upstream version 1.7.0
New upstream release. Thanks to Rodney Lorrimar <rlorrimar@ccg.murdoch.edu.au>.
Drop 01-paramiko.diff - equivalent change made upstream.
releasing version 1.7.0-1