Merge branch 'master' into 'feature/exercise-fileupload'

# Conflicts:
#   frontend/www/scripts/exercise.js
1 job for feature/exercise-fileupload in 1 minute and 2 seconds (queued for 1 second)