Merge remote-tracking branch 'upstream/master'

Conflicts:
	sql/synth_recipes.sql
Updating my fork