Merge branch 'master' of pagure.io/kiskadee
    
    There was a conflict with the docstrings, I am not sure if this was due
    to a forced push to the repository or something else. This commit fixes
    the issue.