Fix for #3549.
Inertia fix.
Merge pull request #3551 from Segrain/master

Pulling fixes.