Fix duplicate lines
Merge branch 'master' into linux