Merge branch 'linux1'