Simplify linux.inc
Merge branch 'dora'