Merge branch 'peewee' into develop

Conflicts:
	trigger/__init__.py