Merge remote-tracking branch 'origin/master' into fix-env-server-segv
Fix segv in collision checking
Merge pull request #415 from garaemon/fix-env-server-segv

Fix env server segv in collision checking with environment