MERGE: Merge branch 'master' into 7.0
MERGE: Merge branch 'master' into 7.0

This "wrong way" merge brings in a change that should have been in 7.0
but was merged to master instead.

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