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

# Conflicts:
#   i18n/languages.js
1 job for rakekniven-master-patch-19485 in 26 seconds (queued for 1 second)