Merge branch 'master' into 'lars-documentation'

# Conflicts:
#   src/engine.py
#   src/mixer.py
1 job for lars-documentation in 1 minute and 19 seconds (queued for 4 seconds)