Update for the v3.0.6 and v3.1.0 releases