Imported Debian version 3.11.0.15.16
Merge branch 'debian'