Merge branch 'master' into 'rakekniven-master-patch-92062'

# Conflicts:
#   i18n/languages.js
1 job for rakekniven-master-patch-92062 in 25 seconds (queued for 3 seconds)