Upgrade to 3.1.0