ENsure class exists for ExpressionSyntaxes and update composer.lock
Merge remote-tracking branch 'origin/1.x' into 1.x

Conflicts:
	composer.lock