Imported Upstream version 3.11.0
Imported Debian patch 3.11.0-15.23