2.2.0
Merge branch 'master' into austria

Conflicts:
	LICENSE
	core.sql