Merge branch 'master' into next

diff --cc wcfsetup/install/files/js/3rdParty/redactor2/redactor.js
index a3a9fd842a70e421c60eaad4b20ec65018bb343b,737bd1fdfd062dfd3eb4e328b9db3ecdc5506ccb..d0f82d2539e32f2237326f491c576ddb886ad810
--- 1/wcfsetup/install/files/js/3rdParty/redactor2/redactor.js
--- 2/wcfsetup/install/files/js/3rdParty/redactor2/redactor.js
+++ b/wcfsetup/install/files/js/3rdParty/redactor2/redactor.js
@@@ -2653,7 -3024,7 +2653,7 @@@
                                                        }
                                                }
                                        });
--
++                                      
                                        // lists
                                        var lastList = false;
                                        var lastLevel = 1;

diff --cc wcfsetup/install/files/lib/system/cronjob/DailyCleanUpCronjob.class.php
Simple merge