normals
Merge remote-tracking branch 'origin/master' into ThomasSafety
trying to merge