Upgrades to v3.1

Upgrades to v3.1