Merge branch 'python_cryptography'
authorVarac <varac@leap.se>
Thu, 29 Jun 2017 18:36:59 +0000 (20:36 +0200)
committerVarac <varac@leap.se>
Thu, 29 Jun 2017 18:36:59 +0000 (20:36 +0200)

Trivial merge