Null-Merge commit '514b3c4' into cg_merges_20131108a

Conflicts:
	Makefile.am
	NEWS
	README.RPC
	api.c
	autogen.sh
	compat/Makefile.am
	compat/jansson-2.5/LICENSE
	compat/jansson-2.5/src/dump.c
	compat/jansson-2.5/src/error.c
	compat/jansson-2.5/src/hashtable.c
	compat/jansson-2.5/src/hashtable.h
	compat/jansson-2.5/src/jansson.def
	compat/jansson-2.5/src/jansson.h
	compat/jansson-2.5/src/jansson_config.h.in
	compat/jansson-2.5/src/jansson_private.h
	compat/jansson-2.5/src/load.c
	compat/jansson-2.5/src/memory.c
	compat/jansson-2.5/src/pack_unpack.c
	compat/jansson-2.5/src/strbuffer.c
	compat/jansson-2.5/src/strbuffer.h
	compat/jansson-2.5/src/strconv.c
	compat/jansson-2.5/src/utf.c
	compat/jansson-2.5/src/utf.h
	compat/jansson-2.5/src/value.c
	configure.ac
	driver-icarus.c
	miner.c
	miner.h
	usbutils.c