Merge remote-tracking branch 'origin/123' into wsq

Conflicts:
	EF/Initial.sql