Fix kernel version checking
Merge remote-tracking branch 'upstream/master'