MERGE: Merge branch '7.1' into 7.2
MERGE: Merge branch '7.1' into 7.2

# Conflicts:
#	composer.json

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