minimalized
Merge branch 'master' into mg

Conflicts:
	trafopop/trafopop.ino