Bugfix
Merge branch 'master' into upload
Fix conflicts
Client-side SHA-256