hotfix for random bad base-64 crash
Merge branch 'develop'