Merge 3.0.5 back to master