# cherry-picked from upstream. Keep in chronological order

# patches that should go upstream

# modifications for Debian