Merge branch 'ninja-intel-linux' into release