release-1.0.5
Merge branch 'release-1.0.5' into development