MERGE: Merge branch '6.1' into 6.2
MERGE: Merge branch '6.1' into 6.2

fcool/flow-development-collection,kdambekalns/flow-development-collection,neos/flow-development-collection,fcool/flow-development-collection,neos/flow-development-collection,kdambekalns/flow-development-collection,fcool/flow-development-collection,neos/flow-development-collection,robertlemke/flow-development-collection,kdambekalns/flow-development-collection,neos/flow-development-collection,robertlemke/flow-development-collection,fcool/flow-development-collection,robertlemke/flow-development-collection,robertlemke/flow-development-collection,kdambekalns/flow-development-collection