Imported Upstream version 3.3.0.17
Imported Debian patch 3.3.0.17-2
Merge tag 'debian/3.3.0.17-2'

Debian release 3.3.0.17-2