Merge branch 'remicollet-issue-float'

Conflicts:
	json_util.c