Merge 3.0.6 back to master