Merge remote-tracking branch 'origin/3.1'

Conflicts:
	composer.json
Fixed composer.json (merge error)
Merge branch '3.1'
Merge branch '3.1'
Exclude @todo from behat runs by default
Merge remote-tracking branch 'origin/3.1'