Merge branch 'hotfix/origin-fallback' into legacy/0.8
Preparing release 0.8.1
Back to development: 0.8.2
remove white-space: pre, closes #77
Merge branch 'fix/issue-77'