Merge branch 'max-upload-size' into 'dev'

Maximum upload size

See merge request !61
2 jobs for dev
in 2 minutes and 49 seconds and was queued for 4 seconds