Add Tim's PR #3834 as a debian patch

Change-Id: Ie0afad0d2dde8550b184d60b050a53f7a0cc34b8
Signed-off-by: Giuseppe Lavagetto <glavagetto@wikimedia.org>