Merge origin/master

Conflicts:
	trigger/trigger.sql