Solving two tickets regarding the math::geometry package
Merge RC with latest fixes.