MERGE: Merge branch '6.0' into master
MERGE: Merge branch '6.0' into master

albe/flow-development-collection,daniellienert/flow-development-collection,bwaidelich/flow-development-collection,dlubitz/flow-development-collection,neos/flow-development-collection,fcool/flow-development-collection,bwaidelich/flow-development-collection,robertlemke/flow-development-collection,albe/flow-development-collection,neos/flow-development-collection,robertlemke/flow-development-collection,fcool/flow-development-collection,robertlemke/flow-development-collection,kdambekalns/flow-development-collection,albe/flow-development-collection,dlubitz/flow-development-collection,neos/flow-development-collection,kdambekalns/flow-development-collection,bwaidelich/flow-development-collection,daniellienert/flow-development-collection,daniellienert/flow-development-collection,robertlemke/flow-development-collection,fcool/flow-development-collection,kdambekalns/flow-development-collection,dlubitz/flow-development-collection,kdambekalns/flow-development-collection,fcool/flow-development-collection,neos/flow-development-collection