Merge branch 'release/v3.0.6' into develop
typo ~.~
bump version
Merge branch 'release/v3.0.7' into anthpack-v2