Bump version to b22.
Merge remote-tracking branch 'origin/master' into splines