Merge remote-tracking branch 'remotes/avalon/avalon' into avalon

Conflicts:
	api.c
	configure.ac
	fpgautils.c
	fpgautils.h
	miner.c
	miner.h
	usbutils.c