Commit e5fc9e74 authored by Ivaria's avatar Ivaria

Merge branch 'revert-ae0b90ef' into 'master'

Revert "Merge branch 'master' into 'classic'"

See merge request !16
parents b981148d 71fa1cd2