Upgrade to final 3.1.1