MT#4637 add the patch merged upstream by Richard.
(cherry picked from commit 6e3fdbef2d5e6b561bddaaf749faf48acd0ac0fe)

Conflicts:
	debian/patches/series
update changelog