Merge branch 'develop'
update version
Merge branch 'release_1.0.5'
Merge branch 'master' into develop