Updates to splines from splines branch.
Merge branch 'splines2' into splines