3.0.6
Merge branch 'official'