Squashed update to 3.1.0