Imported Debian patch 0.22+dfsg-1
Trusty 0.22+dfsg-2