Imported Upstream version 3.0.21
Imported Debian patch 3.0.21-2