Remove those things. Dunno how they gots there :(
Merge branch 'master' into dev