Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Fixed a bug which caused a build error.
Merge branch 'hotfix/0.0.5' into develop