Merge branch '1.2'

Conflicts:
	LICENSE

diff --cc src/hashtable.c
Simple merge

diff --cc src/hashtable.h
Simple merge

diff --cc src/jansson.h
Simple merge

diff --cc src/value.c
Simple merge

diff --cc test/suites/api/run
Simple merge

diff --cc test/suites/api/test_object.c
Simple merge