more correct detection of floor surfaces
Merge upstream/master into andrew/inertia
Merge pull request #2927 from AndrewMeadows/inertia

Improved detection of floor surfaces