Backport

Kernel 3.0.80 support