Bringing up to date with master.
Merge branch 'stable' of github.com:LA1TV/Website-Upload-Processor into stable