Bump version and finish 1.9 fixes