4.2: trigo fix + an optimization to collision detection
Merge branch 'master' into HEAD