Merge tag '2.1' into release
Bump up version for next release