Merge branch 'master' of https://github.com/worklist/hifi
Merge branch 'master' of https://github.com/worklist/hifi
Merge branch 'master' of https://github.com/worklist/hifi
Merge branch 'master' of https://github.com/worklist/hifi
Restore the original floor behavior.
Avoid colliding with gravityless environments.
Merge pull request #404 from ey6es/master

Restore the original floor behavior so we don't sink into the ground.