Upstream release 1.0~m3