Changes for 3.0.6