Merge branch 'master' into 'pacdiff-backup-option'

# Conflicts:
#   completions/zsh/_pacdiff
#   src/pacdiff.sh.in
1 job for !17 with pacdiff-backup-option in 15 seconds (queued for 1 second)
latest merge request