update to master

Change-Id: I6ec0578aa8557ea477bd5159bbe455c97c1fe0fe
Reviewed-on: https://review.typo3.org/28950
Reviewed-by: Michael Blunck
Tested-by: Michael Blunck