Back to basic
Merge remote-tracking branch 'origin/master'

Conflicts:
	features/bootstrap/FeatureContext.php