Merge remote-tracking branch 'refs/remotes/origin/2.1' into 3.0

# Conflicts:

#	wcfsetup/install/files/lib/system/package/validation/PackageValidationArchive.class.php

diff --cc wcfsetup/install/files/lib/system/package/validation/PackageValidationArchive.class.php
index 9860470d928d1fb512a6b9698f4a26a630831ab4,a796e1667bf2bbd504315639a2c140314432c209..ee17009f02c786e1ee4ffa5d6af5794e471968d6
--- 1/wcfsetup/install/files/lib/system/package/validation/PackageValidationArchive.class.php
--- 2/wcfsetup/install/files/lib/system/package/validation/PackageValidationArchive.class.php
+++ b/wcfsetup/install/files/lib/system/package/validation/PackageValidationArchive.class.php
@@@ -191,11 -191,11 +191,11 @@@ class PackageValidationArchive implemen
                
                // delivered package does not provide the minimum required version
                if (Package::compareVersion($requiredVersion, $this->archive->getPackageInfo('version'), '>')) {
 -                      throw new PackageValidationException(PackageValidationException::INSUFFICIENT_VERSION, array(
 +                      throw new PackageValidationException(PackageValidationException::INSUFFICIENT_VERSION, [
-                               'packageName' => $package->packageName,
-                               'packageVersion' => $package->packageVersion,
+                               'packageName' => $this->archive->getPackageInfo('name'),
+                               'packageVersion' => $requiredVersion,
                                'deliveredPackageVersion' => $this->archive->getPackageInfo('version')
 -                      ));
 +                      ]);
                }
                
                // package is not installed yet