Merge branch 'master' of ssh://tiftof@repo.or.cz/srv/git/python-cryptoplus