Tagged 3.0.6-rc2
Merge tag '3.0.6' into 3.0