Merge branch 'next' into next-lantia

diff --cc wcfsetup/install/files/lib/action/ImageProxyAction.class.php
Simple merge

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

diff --cc wcfsetup/install/files/lib/system/package/plugin/ACPMenuPackageInstallationPlugin.class.php
index ad0fa94e87a1c7ac565ef1aae388e91743eb701f,4c5674e2cee747ea76c57c7b77682fe1e6059d4f..cbb2071b39b7405b0e2de93699f6d2f3f0038cc2
--- 1/wcfsetup/install/files/lib/system/package/plugin/ACPMenuPackageInstallationPlugin.class.php
--- 2/wcfsetup/install/files/lib/system/package/plugin/ACPMenuPackageInstallationPlugin.class.php
+++ b/wcfsetup/install/files/lib/system/package/plugin/ACPMenuPackageInstallationPlugin.class.php
@@@ -17,19 -17,9 +17,20 @@@ class ACPMenuPackageInstallationPlugin 
         */
        public $className = 'wcf\data\acp\menu\item\ACPMenuItemEditor';
        
 +      /**
 +       * @see \wcf\system\package\plugin\AbstractMenuPackageInstallationPlugin::prepareImport()
 +       */
 +      protected function prepareImport(array $data) {
 +              $returnValue = parent::prepareImport($data);
 +              
 +              $returnValue['icon'] = (isset($data['elements']['icon'])) ? $data['elements']['icon'] : '';
 +              
 +              return $returnValue;
 +      }
 +      
        /**
         * @see \wcf\system\package\plugin\IPackageInstallationPlugin::getDefaultFilename()
+        * @since       2.2
         */
        public static function getDefaultFilename() {
                return 'acpMenu.xml';

diff --cc wcfsetup/install/files/lib/system/package/plugin/AbstractXMLPackageInstallationPlugin.class.php
Simple merge

diff --cc wcfsetup/install/files/lib/system/session/SessionFactory.class.php
Simple merge

diff --cc wcfsetup/install/files/lib/system/session/SessionHandler.class.php
Simple merge