Collision: replaced force cancel with position enforcement.
Merge branch 'master' into gh-pages