Merge tag '3.1' into release
Bump up version to 3.2 for next release