Merge branch '2.0'

Conflicts:
	wcfsetup/install/files/js/WCF.Moderation.min.js
	wcfsetup/install/files/lib/system/package/PackageArchive.class.php

diff --cc wcfsetup/install/files/lib/acp/form/PackageStartInstallForm.class.php
Simple merge

diff --cc wcfsetup/install/files/lib/system/package/validation/PackageValidationArchive.class.php
index 970131e06daa417ba21d8cdf5bc20933186ab057,081d38d2610ca0714aefc5938a0268e8f29bb3c8..c1fcda44b0ed510e752753b47c3ac0f801e238b3
--- 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
@@@ -92,9 -92,10 +92,9 @@@ class PackageValidationArchive implemen
                                $this->archive->openArchive();
                                
                                // check if package is installable or suitable for an update
 -                              $this->validateInstructions($requiredVersion);
 +                              $this->validateInstructions($requiredVersion, $validationMode);
                        }
-                       catch (\Exception $e) {
+                       catch (PackageValidationException $e) {
                                $this->exception = $e;
                                
                                return false;

diff --cc wcfsetup/install/files/lib/system/package/validation/PackageValidationManager.class.php
Simple merge