Update to v3.0.4 (see changelog for details)