Merge branch 'dev' into upload-verify
BAC-86: Add a hook to check if uploaded image file is corrupted (improved handling of warnings coming from ImageMagick)
Merge branch 'upload-verify' into dev