support for building against custom kernels
Merge remote-tracking branch 'upstream/master'
A fix.