Merge remote-tracking branch 'origin/master'

Conflicts:
	Makefile
	runoff
	runoff.spec