Bounds checking on barycentric interpolator improved.
Merge conflicts fixed.