Backport of fixes and features from master

Change-Id: I0dd194c68b48995b32cb56d3a0886485962ba7fc
Reviewed-on: http://review.typo3.org/31887
Reviewed-by: Jo Hasenau <info@cybercraft.de>
Tested-by: Jo Hasenau <info@cybercraft.de>