Merged in Debian's Git repo. Thank you.