Null-Merge commit 'c50b13a' into cg_merges_20131023a

Conflicts:
	driver-avalon.c
	driver-bitfury.c
	driver-bitfury.h
	driver-icarus.c
	miner.c
	miner.h
	usbutils.c
	usbutils.h