Merge branch 'master' into 'feature/inf-scroll'

# Conflicts:
#   frontend/www/scripts/exercises.js
1 job for feature/inf-scroll in 1 minute and 2 seconds