Update to v3.1.8 (see changelog for details)