Null-Merge commit 'a139196' into cg_merges_20131108a

Conflicts:
	Makefile.am
	NEWS
	README.RPC
	api.c
	configure.ac
	driver-avalon.c
	driver-bitfury.c
	driver-bitfury.h
	driver-icarus.c
	miner.c
	miner.h
	usbutils.c
	usbutils.h