Post 3.6.0b1 merge