Update version to 11.4 in build.xml too
Merge remote-tracking branch 'origin/develop'
Merge remote-tracking branch 'origin/master' into prod

Conflicts:
	build.xml