Fixing file routing (PR #608)
Freeze actions while image uploading is in progress
Merge branch 'patch-1', 'pullrequests'