Merge branch 'develop' into '79-add-viktor-to-humans-txt'

# Conflicts:
#   html/humans.txt
2 jobs for 79-add-viktor-to-humans-txt in 4 minutes and 58 seconds (queued for 2 seconds)