Merge branch 'hotfix/1.2-hf1'
Fixed bug in code that attempts to submit files to Scribd
Merge branch 'hotfix/1.2-hf2' into develop