Set version to 1.0.5
Merge branch 'release-1.0.5'
Merge branch 'master' into develop