Merge remote-tracking branch 'upstream/master'

Conflicts:
	actual-gear-measurements.txt
	gears-dev.inx
	gears-dev.py

attempting merge