Merge branch 'release/0.3.16' into develop
Merge pull request #1 from icyleaf/develop

Merge branch 'release/0.3.16' into develop