Merge branch 'master' into invalid_normals_in_unittest
authorKim Kulling <kimkulling@users.noreply.github.com>
Sat, 14 Oct 2017 15:06:57 +0000 (17:06 +0200)
committerGitHub <noreply@github.com>
Sat, 14 Oct 2017 15:06:57 +0000 (17:06 +0200)

Trivial merge