Bump 1.11.4
Merge branch 'support/1.11' into next

Conflicts:
	Changelog