Update to v3.1.0 (see changelog for details)