Fix Z-fighting of faces
Merge remote-tracking branch 'origin/master'