3.0.7 goes upstream \o/