Update to v3.1.2 (see changelog for details)