Merging master into release for release 3.0.6.