1.1 branch for 3.0
Upgrades for 3.1 compatibility