Commit b981148d authored by Ivaria's avatar Ivaria

Merge branch 'classic' into 'master'

# Conflicts:
#   .pkgmeta
parents 340ae3ee 352c7416