v3.0.2
Merge branch 'master' into austria

Conflicts:
	LICENSE
	core.sql
merged v3.0.0