Change-Id: I757f66eec3d035203431958cd283bb77abd9f182
Fixes: #34860
Fixes: #33685
Releases: 6.0, 4.7, 4.6, 4.5
Reviewed-on: http://review.typo3.org/9860
Tested-by: Francois Suter
Reviewed-by: Philipp Gampe
Tested-by: Philipp Gampe
Reviewed-by: Andy Grunwald
Tested-by: Andy Grunwald
Reviewed-by: Wouter Wolters
Tested-by: Wouter Wolters
Reviewed-by: Christian Kuhn
Tested-by: Christian Kuhn
Reviewed-by: Stefan Galinski
Tested-by: Stefan Galinski