Fix Ertilp kernel again. Previous changes disappeared. (?!)
Merge remote-tracking branch 'origin/master'