Null-Merge commit 'dd64f73' into cg_merges_20131023a

Conflicts:
	compat/jansson/Makefile.am
	compat/jansson/dump.c
	compat/jansson/error.c
	compat/jansson/hashtable.c
	compat/jansson/hashtable.h
	compat/jansson/jansson.h
	compat/jansson/jansson_config.h
	compat/jansson/jansson_config.h.in
	compat/jansson/jansson_private.h
	compat/jansson/load.c
	compat/jansson/memory.c
	compat/jansson/strbuffer.c
	compat/jansson/strbuffer.h
	compat/jansson/utf.c
	compat/jansson/utf.h
	compat/jansson/value.c
	configure.ac
	util.c