Fix FS#42793

Apply patch from upstream


git-svn-id: file:///srv/repos/svn-packages/svn@226348 eb2447ed-0c53-47e4-bac8-5bc4a241df78
archrelease: copy trunk to testing-i686, testing-x86_64

git-svn-id: file:///srv/repos/svn-packages/svn@226349 eb2447ed-0c53-47e4-bac8-5bc4a241df78