Update to v3.1.5 (see changelog for details)