Merge branch 'master' into develop
pyOpenSSL expects strings, not unicode. :(
Merge branch 'release-0.0.9'