v3.0.3
Merge branch 'master' into austria

Conflicts:
	core.sql
	update/core-update.v2.2.6-v3.0.1.sql