Merge branch 'master' into 'http-redir-fix'

# Conflicts:
#   librefi/fxckers/_common.py
2 jobs for http-redir-fix in 51 seconds (queued for 3 seconds)