Version 0.8.3
Merge branch 'hotfix-0.8.3'