Null-Merge commit '08ece33' into hotplug

Conflicts:
	api.c
	driver-bitforce.c
	driver-cpu.c
	driver-icarus.c
	driver-modminer.c
	driver-opencl.c
	miner.c
	miner.h
	usbutils.c