Merge branch 'develop' into 'develop'

Fix failure to serve media from custom upload path

See merge request !95
1 job for develop in 2 minutes and 48 seconds (queued for 13 seconds)