Null-Merge commit 'fbf46c4' into cg_merges_20131023a

Conflicts:
	api.c
	driver-avalon.c
	driver-bflsc.c
	driver-bitforce.c
	driver-bitfury.c
	driver-icarus.c
	driver-modminer.c
	driver-opencl.c
	driver-ztex.c
	miner.c
	miner.h
	usbutils.c