Build #11:   Merge branch 'hotfix/1.0.5' on branch v1.0.5 over 6 years ago