167 files changed, 9 insertions, 7 deletions
diff --git a/lib/jsoncpp/jsoncpp/AUTHORS b/lib/jsoncpp/AUTHORS
index c0fbbeec11..c0fbbeec11 100644
--- a/lib/jsoncpp/jsoncpp/AUTHORS
+++ b/lib/jsoncpp/AUTHORS
diff --git a/lib/jsoncpp/jsoncpp/README.txt b/lib/jsoncpp/README.txt
index c1b2c73383..c1b2c73383 100644
--- a/lib/jsoncpp/jsoncpp/README.txt
+++ b/lib/jsoncpp/README.txt
diff --git a/lib/jsoncpp/jsoncpp/SConstruct b/lib/jsoncpp/SConstruct
index 00d37411bd..00d37411bd 100644
--- a/lib/jsoncpp/jsoncpp/SConstruct
+++ b/lib/jsoncpp/SConstruct
diff --git a/lib/jsoncpp/jsoncpp/doc/doxyfile.in b/lib/jsoncpp/doc/doxyfile.in
index f19f037705..f19f037705 100644
--- a/lib/jsoncpp/jsoncpp/doc/doxyfile.in
+++ b/lib/jsoncpp/doc/doxyfile.in
diff --git a/lib/jsoncpp/jsoncpp/doc/footer.html b/lib/jsoncpp/doc/footer.html
index a61d9528a1..a61d9528a1 100644
--- a/lib/jsoncpp/jsoncpp/doc/footer.html
+++ b/lib/jsoncpp/doc/footer.html
diff --git a/lib/jsoncpp/jsoncpp/doc/header.html b/lib/jsoncpp/doc/header.html
index d56ea59c69..d56ea59c69 100644
--- a/lib/jsoncpp/jsoncpp/doc/header.html
+++ b/lib/jsoncpp/doc/header.html
diff --git a/lib/jsoncpp/jsoncpp/doc/jsoncpp.dox b/lib/jsoncpp/doc/jsoncpp.dox
index fc7b530eba..fc7b530eba 100644
--- a/lib/jsoncpp/jsoncpp/doc/jsoncpp.dox
+++ b/lib/jsoncpp/doc/jsoncpp.dox
diff --git a/lib/jsoncpp/jsoncpp/doc/readme.txt b/lib/jsoncpp/doc/readme.txt
index 0e42cdfb4c..0e42cdfb4c 100644
--- a/lib/jsoncpp/jsoncpp/doc/readme.txt
+++ b/lib/jsoncpp/doc/readme.txt
diff --git a/lib/jsoncpp/jsoncpp/doc/roadmap.dox b/lib/jsoncpp/doc/roadmap.dox
index 84648b9eed..84648b9eed 100644
--- a/lib/jsoncpp/jsoncpp/doc/roadmap.dox
+++ b/lib/jsoncpp/doc/roadmap.dox
diff --git a/lib/jsoncpp/jsoncpp/doc/sconscript b/lib/jsoncpp/doc/sconscript
index 7b78a21d80..7b78a21d80 100644
--- a/lib/jsoncpp/jsoncpp/doc/sconscript
+++ b/lib/jsoncpp/doc/sconscript
diff --git a/lib/jsoncpp/jsoncpp/include/json/autolink.h b/lib/jsoncpp/include/json/autolink.h
index 37c9258ed5..37c9258ed5 100644
--- a/lib/jsoncpp/jsoncpp/include/json/autolink.h
+++ b/lib/jsoncpp/include/json/autolink.h
diff --git a/lib/jsoncpp/jsoncpp/include/json/config.h b/lib/jsoncpp/include/json/config.h
index 5d334cbc5e..5d334cbc5e 100644
--- a/lib/jsoncpp/jsoncpp/include/json/config.h
+++ b/lib/jsoncpp/include/json/config.h
diff --git a/lib/jsoncpp/jsoncpp/include/json/features.h b/lib/jsoncpp/include/json/features.h
index 5a9adec118..5a9adec118 100644
--- a/lib/jsoncpp/jsoncpp/include/json/features.h
+++ b/lib/jsoncpp/include/json/features.h
diff --git a/lib/jsoncpp/jsoncpp/include/json/forwards.h b/lib/jsoncpp/include/json/forwards.h
index ee76071c12..ee76071c12 100644
--- a/lib/jsoncpp/jsoncpp/include/json/forwards.h
+++ b/lib/jsoncpp/include/json/forwards.h
diff --git a/lib/jsoncpp/jsoncpp/include/json/json.h b/lib/jsoncpp/include/json/json.h
index c71ed65abf..c71ed65abf 100644
--- a/lib/jsoncpp/jsoncpp/include/json/json.h
+++ b/lib/jsoncpp/include/json/json.h
diff --git a/lib/jsoncpp/jsoncpp/include/json/reader.h b/lib/jsoncpp/include/json/reader.h
index ee1d6a2444..ee1d6a2444 100644
--- a/lib/jsoncpp/jsoncpp/include/json/reader.h
+++ b/lib/jsoncpp/include/json/reader.h
diff --git a/lib/jsoncpp/jsoncpp/include/json/value.h b/lib/jsoncpp/include/json/value.h
index ce3d3cd0e9..ce3d3cd0e9 100644
--- a/lib/jsoncpp/jsoncpp/include/json/value.h
+++ b/lib/jsoncpp/include/json/value.h
diff --git a/lib/jsoncpp/jsoncpp/include/json/writer.h b/lib/jsoncpp/include/json/writer.h
index cfa92c6ae4..cfa92c6ae4 100644
--- a/lib/jsoncpp/jsoncpp/include/json/writer.h
+++ b/lib/jsoncpp/include/json/writer.h
diff --git a/lib/jsoncpp/jsoncpp/src/lib_json/Makefile.in b/lib/jsoncpp/jsoncpp/src/lib_json/Makefile.in
deleted file mode 100644
index fc615bcdec..0000000000
--- a/lib/jsoncpp/jsoncpp/src/lib_json/Makefile.in
+++ /dev/null
@@ -1,7 +0,0 @@
-INCLUDES=-I../../include
-
-SRCS=json_reader.cpp json_value.cpp json_writer.cpp
-
-LIB= libjsoncpp.a
-
-include ../../../../../Makefile.include
diff --git a/lib/jsoncpp/jsoncpp/makefiles/vs71/jsoncpp.sln b/lib/jsoncpp/makefiles/vs71/jsoncpp.sln
index dd2f91b442..dd2f91b442 100644
--- a/lib/jsoncpp/jsoncpp/makefiles/vs71/jsoncpp.sln
+++ b/lib/jsoncpp/makefiles/vs71/jsoncpp.sln
diff --git a/lib/jsoncpp/jsoncpp/makefiles/vs71/jsontest.vcproj b/lib/jsoncpp/makefiles/vs71/jsontest.vcproj
index 562c71f61a..562c71f61a 100644
--- a/lib/jsoncpp/jsoncpp/makefiles/vs71/jsontest.vcproj
+++ b/lib/jsoncpp/makefiles/vs71/jsontest.vcproj
diff --git a/lib/jsoncpp/jsoncpp/makefiles/vs71/lib_json.vcproj b/lib/jsoncpp/makefiles/vs71/lib_json.vcproj
index 1aa5978a1f..1aa5978a1f 100644
--- a/lib/jsoncpp/jsoncpp/makefiles/vs71/lib_json.vcproj
+++ b/lib/jsoncpp/makefiles/vs71/lib_json.vcproj
diff --git a/lib/jsoncpp/jsoncpp/makefiles/vs71/test_lib_json.vcproj b/lib/jsoncpp/makefiles/vs71/test_lib_json.vcproj
index 9ebb986a66..9ebb986a66 100644
--- a/lib/jsoncpp/jsoncpp/makefiles/vs71/test_lib_json.vcproj
+++ b/lib/jsoncpp/makefiles/vs71/test_lib_json.vcproj
diff --git a/lib/jsoncpp/jsoncpp/scons-tools/doxygen.py b/lib/jsoncpp/scons-tools/doxygen.py
index 5ace420a4c..5ace420a4c 100644
--- a/lib/jsoncpp/jsoncpp/scons-tools/doxygen.py
+++ b/lib/jsoncpp/scons-tools/doxygen.py
diff --git a/lib/jsoncpp/jsoncpp/scons-tools/globtool.py b/lib/jsoncpp/scons-tools/globtool.py
index 811140e8aa..811140e8aa 100644
--- a/lib/jsoncpp/jsoncpp/scons-tools/globtool.py
+++ b/lib/jsoncpp/scons-tools/globtool.py
diff --git a/lib/jsoncpp/jsoncpp/scons-tools/srcdist.py b/lib/jsoncpp/scons-tools/srcdist.py
index 864ff40815..864ff40815 100644
--- a/lib/jsoncpp/jsoncpp/scons-tools/srcdist.py
+++ b/lib/jsoncpp/scons-tools/srcdist.py
diff --git a/lib/jsoncpp/jsoncpp/scons-tools/substinfile.py b/lib/jsoncpp/scons-tools/substinfile.py
index 4d305851bb..4d305851bb 100644
--- a/lib/jsoncpp/jsoncpp/scons-tools/substinfile.py
+++ b/lib/jsoncpp/scons-tools/substinfile.py
diff --git a/lib/jsoncpp/jsoncpp/scons-tools/targz.py b/lib/jsoncpp/scons-tools/targz.py
index f5432003df..f5432003df 100644
--- a/lib/jsoncpp/jsoncpp/scons-tools/targz.py
+++ b/lib/jsoncpp/scons-tools/targz.py
diff --git a/lib/jsoncpp/jsoncpp/src/jsontestrunner/main.cpp b/lib/jsoncpp/src/jsontestrunner/main.cpp
index 231ee0c44d..231ee0c44d 100644
--- a/lib/jsoncpp/jsoncpp/src/jsontestrunner/main.cpp
+++ b/lib/jsoncpp/src/jsontestrunner/main.cpp
diff --git a/lib/jsoncpp/jsoncpp/src/jsontestrunner/sconscript b/lib/jsoncpp/src/jsontestrunner/sconscript
index 6e68e31533..6e68e31533 100644
--- a/lib/jsoncpp/jsoncpp/src/jsontestrunner/sconscript
+++ b/lib/jsoncpp/src/jsontestrunner/sconscript
diff --git a/lib/jsoncpp/src/lib_json/Makefile.in b/lib/jsoncpp/src/lib_json/Makefile.in
new file mode 100644
index 0000000000..4746eb2a05
--- /dev/null
+++ b/lib/jsoncpp/src/lib_json/Makefile.in
@@ -0,0 +1,9 @@
+INCLUDES=-I../../include
+
+SRCS=json_reader.cpp \
+     json_value.cpp \
+     json_writer.cpp \
+
+LIB= libjsoncpp.a
+
+include ../../../../Makefile.include
diff --git a/lib/jsoncpp/jsoncpp/src/lib_json/json_batchallocator.h b/lib/jsoncpp/src/lib_json/json_batchallocator.h
index 87ea5ed807..87ea5ed807 100644
--- a/lib/jsoncpp/jsoncpp/src/lib_json/json_batchallocator.h
+++ b/lib/jsoncpp/src/lib_json/json_batchallocator.h
diff --git a/lib/jsoncpp/jsoncpp/src/lib_json/json_internalarray.inl b/lib/jsoncpp/src/lib_json/json_internalarray.inl
index 9b985d2585..9b985d2585 100644
--- a/lib/jsoncpp/jsoncpp/src/lib_json/json_internalarray.inl
+++ b/lib/jsoncpp/src/lib_json/json_internalarray.inl
diff --git a/lib/jsoncpp/jsoncpp/src/lib_json/json_internalmap.inl b/lib/jsoncpp/src/lib_json/json_internalmap.inl
index 19771488d6..19771488d6 100644
--- a/lib/jsoncpp/jsoncpp/src/lib_json/json_internalmap.inl
+++ b/lib/jsoncpp/src/lib_json/json_internalmap.inl
diff --git a/lib/jsoncpp/jsoncpp/src/lib_json/json_reader.cpp b/lib/jsoncpp/src/lib_json/json_reader.cpp
index 4eb2d11fd3..4eb2d11fd3 100644
--- a/lib/jsoncpp/jsoncpp/src/lib_json/json_reader.cpp
+++ b/lib/jsoncpp/src/lib_json/json_reader.cpp
diff --git a/lib/jsoncpp/jsoncpp/src/lib_json/json_value.cpp b/lib/jsoncpp/src/lib_json/json_value.cpp
index bee3f70f64..bee3f70f64 100644
--- a/lib/jsoncpp/jsoncpp/src/lib_json/json_value.cpp
+++ b/lib/jsoncpp/src/lib_json/json_value.cpp
diff --git a/lib/jsoncpp/jsoncpp/src/lib_json/json_valueiterator.inl b/lib/jsoncpp/src/lib_json/json_valueiterator.inl
index 898c35895b..898c35895b 100644
--- a/lib/jsoncpp/jsoncpp/src/lib_json/json_valueiterator.inl
+++ b/lib/jsoncpp/src/lib_json/json_valueiterator.inl
diff --git a/lib/jsoncpp/jsoncpp/src/lib_json/json_writer.cpp b/lib/jsoncpp/src/lib_json/json_writer.cpp
index 2f17428954..2f17428954 100644
--- a/lib/jsoncpp/jsoncpp/src/lib_json/json_writer.cpp
+++ b/lib/jsoncpp/src/lib_json/json_writer.cpp
diff --git a/lib/jsoncpp/jsoncpp/src/lib_json/sconscript b/lib/jsoncpp/src/lib_json/sconscript
index 6e7c6c8a07..6e7c6c8a07 100644
--- a/lib/jsoncpp/jsoncpp/src/lib_json/sconscript
+++ b/lib/jsoncpp/src/lib_json/sconscript
diff --git a/lib/jsoncpp/jsoncpp/src/test_lib_json/jsontest.cpp b/lib/jsoncpp/src/test_lib_json/jsontest.cpp
index dfd2b5c77d..dfd2b5c77d 100644
--- a/lib/jsoncpp/jsoncpp/src/test_lib_json/jsontest.cpp
+++ b/lib/jsoncpp/src/test_lib_json/jsontest.cpp
diff --git a/lib/jsoncpp/jsoncpp/src/test_lib_json/jsontest.h b/lib/jsoncpp/src/test_lib_json/jsontest.h
index b2553baea1..b2553baea1 100644
--- a/lib/jsoncpp/jsoncpp/src/test_lib_json/jsontest.h
+++ b/lib/jsoncpp/src/test_lib_json/jsontest.h
diff --git a/lib/jsoncpp/jsoncpp/src/test_lib_json/main.cpp b/lib/jsoncpp/src/test_lib_json/main.cpp
index b80776d630..b80776d630 100644
--- a/lib/jsoncpp/jsoncpp/src/test_lib_json/main.cpp
+++ b/lib/jsoncpp/src/test_lib_json/main.cpp
diff --git a/lib/jsoncpp/jsoncpp/src/test_lib_json/sconscript b/lib/jsoncpp/src/test_lib_json/sconscript
index 915fd01c0a..915fd01c0a 100644
--- a/lib/jsoncpp/jsoncpp/src/test_lib_json/sconscript
+++ b/lib/jsoncpp/src/test_lib_json/sconscript
diff --git a/lib/jsoncpp/jsoncpp/test/cleantests.py b/lib/jsoncpp/test/cleantests.py
index c38fd8ffdd..c38fd8ffdd 100644
--- a/lib/jsoncpp/jsoncpp/test/cleantests.py
+++ b/lib/jsoncpp/test/cleantests.py
diff --git a/lib/jsoncpp/jsoncpp/test/data/test_array_01.expected b/lib/jsoncpp/test/data/test_array_01.expected
index a341ff753c..a341ff753c 100644
--- a/lib/jsoncpp/jsoncpp/test/data/test_array_01.expected
+++ b/lib/jsoncpp/test/data/test_array_01.expected
diff --git a/lib/jsoncpp/jsoncpp/test/data/test_array_01.json b/lib/jsoncpp/test/data/test_array_01.json
index fe51488c70..fe51488c70 100644
--- a/lib/jsoncpp/jsoncpp/test/data/test_array_01.json
+++ b/lib/jsoncpp/test/data/test_array_01.json
diff --git a/lib/jsoncpp/jsoncpp/test/data/test_array_02.expected b/lib/jsoncpp/test/data/test_array_02.expected
index ef1f2623de..ef1f2623de 100644
--- a/lib/jsoncpp/jsoncpp/test/data/test_array_02.expected
+++ b/lib/jsoncpp/test/data/test_array_02.expected
diff --git a/lib/jsoncpp/jsoncpp/test/data/test_array_02.json b/lib/jsoncpp/test/data/test_array_02.json
index 7660873d10..7660873d10 100644
--- a/lib/jsoncpp/jsoncpp/test/data/test_array_02.json
+++ b/lib/jsoncpp/test/data/test_array_02.json
diff --git a/lib/jsoncpp/jsoncpp/test/data/test_array_03.expected b/lib/jsoncpp/test/data/test_array_03.expected
index 3d8dc18eb1..3d8dc18eb1 100644
--- a/lib/jsoncpp/jsoncpp/test/data/test_array_03.expected
+++ b/lib/jsoncpp/test/data/test_array_03.expected
diff --git a/lib/jsoncpp/jsoncpp/test/data/test_array_03.json b/lib/jsoncpp/test/data/test_array_03.json
index 9b3f924755..9b3f924755 100644
--- a/lib/jsoncpp/jsoncpp/test/data/test_array_03.json
+++ b/lib/jsoncpp/test/data/test_array_03.json
diff --git a/lib/jsoncpp/jsoncpp/test/data/test_array_04.expected b/lib/jsoncpp/test/data/test_array_04.expected
index ad4add9794..ad4add9794 100644
--- a/lib/jsoncpp/jsoncpp/test/data/test_array_04.expected
+++ b/lib/jsoncpp/test/data/test_array_04.expected
diff --git a/lib/jsoncpp/jsoncpp/test/data/test_array_04.json b/lib/jsoncpp/test/data/test_array_04.json
index ecca546b2c..ecca546b2c 100644
--- a/lib/jsoncpp/jsoncpp/test/data/test_array_04.json
+++ b/lib/jsoncpp/test/data/test_array_04.json
diff --git a/lib/jsoncpp/jsoncpp/test/data/test_array_05.expected b/lib/jsoncpp/test/data/test_array_05.expected
index 76cff87c2a..76cff87c2a 100644
--- a/lib/jsoncpp/jsoncpp/test/data/test_array_05.expected
+++ b/lib/jsoncpp/test/data/test_array_05.expected
diff --git a/lib/jsoncpp/jsoncpp/test/data/test_array_05.json b/lib/jsoncpp/test/data/test_array_05.json
index 7809d6c9a1..7809d6c9a1 100644
--- a/lib/jsoncpp/jsoncpp/test/data/test_array_05.json
+++ b/lib/jsoncpp/test/data/test_array_05.json
diff --git a/lib/jsoncpp/jsoncpp/test/data/test_array_06.expected b/lib/jsoncpp/test/data/test_array_06.expected
index 5c9f48eaac..5c9f48eaac 100644
--- a/lib/jsoncpp/jsoncpp/test/data/test_array_06.expected
+++ b/lib/jsoncpp/test/data/test_array_06.expected
diff --git a/lib/jsoncpp/jsoncpp/test/data/test_array_06.json b/lib/jsoncpp/test/data/test_array_06.json
index 7f6c516afd..7f6c516afd 100644
--- a/lib/jsoncpp/jsoncpp/test/data/test_array_06.json
+++ b/lib/jsoncpp/test/data/test_array_06.json
diff --git a/lib/jsoncpp/jsoncpp/test/data/test_basic_01.expected b/lib/jsoncpp/test/data/test_basic_01.expected
index d761fce1cc..d761fce1cc 100644
--- a/lib/jsoncpp/jsoncpp/test/data/test_basic_01.expected
+++ b/lib/jsoncpp/test/data/test_basic_01.expected
diff --git a/lib/jsoncpp/jsoncpp/test/data/test_basic_01.json b/lib/jsoncpp/test/data/test_basic_01.json
index 11f11f9be3..11f11f9be3 100644
--- a/lib/jsoncpp/jsoncpp/test/data/test_basic_01.json
+++ b/lib/jsoncpp/test/data/test_basic_01.json
diff --git a/lib/jsoncpp/jsoncpp/test/data/test_basic_02.expected b/lib/jsoncpp/test/data/test_basic_02.expected
index 650e37cbaa..650e37cbaa 100644
--- a/lib/jsoncpp/jsoncpp/test/data/test_basic_02.expected
+++ b/lib/jsoncpp/test/data/test_basic_02.expected
diff --git a/lib/jsoncpp/jsoncpp/test/data/test_basic_02.json b/lib/jsoncpp/test/data/test_basic_02.json
index bf11bceac7..bf11bceac7 100644
--- a/lib/jsoncpp/jsoncpp/test/data/test_basic_02.json
+++ b/lib/jsoncpp/test/data/test_basic_02.json
diff --git a/lib/jsoncpp/jsoncpp/test/data/test_basic_03.expected b/lib/jsoncpp/test/data/test_basic_03.expected
index 1da2d395b8..1da2d395b8 100644
--- a/lib/jsoncpp/jsoncpp/test/data/test_basic_03.expected
+++ b/lib/jsoncpp/test/data/test_basic_03.expected
diff --git a/lib/jsoncpp/jsoncpp/test/data/test_basic_03.json b/lib/jsoncpp/test/data/test_basic_03.json
index a92b6bd28b..a92b6bd28b 100644
--- a/lib/jsoncpp/jsoncpp/test/data/test_basic_03.json
+++ b/lib/jsoncpp/test/data/test_basic_03.json
diff --git a/lib/jsoncpp/jsoncpp/test/data/test_basic_04.expected b/lib/jsoncpp/test/data/test_basic_04.expected
index 013f424f93..013f424f93 100644
--- a/lib/jsoncpp/jsoncpp/test/data/test_basic_04.expected
+++ b/lib/jsoncpp/test/data/test_basic_04.expected
diff --git a/lib/jsoncpp/jsoncpp/test/data/test_basic_04.json b/lib/jsoncpp/test/data/test_basic_04.json
index 17eeb99e0b..17eeb99e0b 100644
--- a/lib/jsoncpp/jsoncpp/test/data/test_basic_04.json
+++ b/lib/jsoncpp/test/data/test_basic_04.json
diff --git a/lib/jsoncpp/jsoncpp/test/data/test_basic_05.expected b/lib/jsoncpp/test/data/test_basic_05.expected
index c8db822e58..c8db822e58 100644
--- a/lib/jsoncpp/jsoncpp/test/data/test_basic_05.expected
+++ b/lib/jsoncpp/test/data/test_basic_05.expected
diff --git a/lib/jsoncpp/jsoncpp/test/data/test_basic_05.json b/lib/jsoncpp/test/data/test_basic_05.json
index d0aaea2126..d0aaea2126 100644
--- a/lib/jsoncpp/jsoncpp/test/data/test_basic_05.json
+++ b/lib/jsoncpp/test/data/test_basic_05.json
diff --git a/lib/jsoncpp/jsoncpp/test/data/test_basic_06.expected b/lib/jsoncpp/test/data/test_basic_06.expected
index 49be55a965..49be55a965 100644
--- a/lib/jsoncpp/jsoncpp/test/data/test_basic_06.expected
+++ b/lib/jsoncpp/test/data/test_basic_06.expected
diff --git a/lib/jsoncpp/jsoncpp/test/data/test_basic_06.json b/lib/jsoncpp/test/data/test_basic_06.json
index 7eead1ee75..7eead1ee75 100644
--- a/lib/jsoncpp/jsoncpp/test/data/test_basic_06.json
+++ b/lib/jsoncpp/test/data/test_basic_06.json
diff --git a/lib/jsoncpp/jsoncpp/test/data/test_basic_07.expected b/lib/jsoncpp/test/data/test_basic_07.expected
index fe55a6a854..fe55a6a854 100644
--- a/lib/jsoncpp/jsoncpp/test/data/test_basic_07.expected
+++ b/lib/jsoncpp/test/data/test_basic_07.expected
diff --git a/lib/jsoncpp/jsoncpp/test/data/test_basic_07.json b/lib/jsoncpp/test/data/test_basic_07.json
index a864bc487d..a864bc487d 100644
--- a/lib/jsoncpp/jsoncpp/test/data/test_basic_07.json
+++ b/lib/jsoncpp/test/data/test_basic_07.json
diff --git a/lib/jsoncpp/jsoncpp/test/data/test_basic_08.expected b/lib/jsoncpp/test/data/test_basic_08.expected
index c8db822e58..c8db822e58 100644
--- a/lib/jsoncpp/jsoncpp/test/data/test_basic_08.expected
+++ b/lib/jsoncpp/test/data/test_basic_08.expected
diff --git a/lib/jsoncpp/jsoncpp/test/data/test_basic_08.json b/lib/jsoncpp/test/data/test_basic_08.json
index fd78837c0c..fd78837c0c 100644
--- a/lib/jsoncpp/jsoncpp/test/data/test_basic_08.json
+++ b/lib/jsoncpp/test/data/test_basic_08.json
diff --git a/lib/jsoncpp/jsoncpp/test/data/test_basic_09.expected b/lib/jsoncpp/test/data/test_basic_09.expected
index c8db822e58..c8db822e58 100644
--- a/lib/jsoncpp/jsoncpp/test/data/test_basic_09.expected
+++ b/lib/jsoncpp/test/data/test_basic_09.expected
diff --git a/lib/jsoncpp/jsoncpp/test/data/test_basic_09.json b/lib/jsoncpp/test/data/test_basic_09.json
index fc95f0f514..fc95f0f514 100644
--- a/lib/jsoncpp/jsoncpp/test/data/test_basic_09.json
+++ b/lib/jsoncpp/test/data/test_basic_09.json
diff --git a/lib/jsoncpp/jsoncpp/test/data/test_comment_01.expected b/lib/jsoncpp/test/data/test_comment_01.expected
index 2a7f00c450..2a7f00c450 100644
--- a/lib/jsoncpp/jsoncpp/test/data/test_comment_01.expected
+++ b/lib/jsoncpp/test/data/test_comment_01.expected
diff --git a/lib/jsoncpp/jsoncpp/test/data/test_comment_01.json b/lib/jsoncpp/test/data/test_comment_01.json
index 7363490a91..7363490a91 100644
--- a/lib/jsoncpp/jsoncpp/test/data/test_comment_01.json
+++ b/lib/jsoncpp/test/data/test_comment_01.json
diff --git a/lib/jsoncpp/jsoncpp/test/data/test_complex_01.expected b/lib/jsoncpp/test/data/test_complex_01.expected
index 7573c8812d..7573c8812d 100644
--- a/lib/jsoncpp/jsoncpp/test/data/test_complex_01.expected
+++ b/lib/jsoncpp/test/data/test_complex_01.expected
diff --git a/lib/jsoncpp/jsoncpp/test/data/test_complex_01.json b/lib/jsoncpp/test/data/test_complex_01.json
index cc0f30f5c3..cc0f30f5c3 100644
--- a/lib/jsoncpp/jsoncpp/test/data/test_complex_01.json
+++ b/lib/jsoncpp/test/data/test_complex_01.json
diff --git a/lib/jsoncpp/jsoncpp/test/data/test_integer_01.expected b/lib/jsoncpp/test/data/test_integer_01.expected
index 593f1db32b..593f1db32b 100644
--- a/lib/jsoncpp/jsoncpp/test/data/test_integer_01.expected
+++ b/lib/jsoncpp/test/data/test_integer_01.expected
diff --git a/lib/jsoncpp/jsoncpp/test/data/test_integer_01.json b/lib/jsoncpp/test/data/test_integer_01.json
index 5ab12ffee4..5ab12ffee4 100644
--- a/lib/jsoncpp/jsoncpp/test/data/test_integer_01.json
+++ b/lib/jsoncpp/test/data/test_integer_01.json
diff --git a/lib/jsoncpp/jsoncpp/test/data/test_integer_02.expected b/lib/jsoncpp/test/data/test_integer_02.expected
index 4b83bd7cae..4b83bd7cae 100644
--- a/lib/jsoncpp/jsoncpp/test/data/test_integer_02.expected
+++ b/lib/jsoncpp/test/data/test_integer_02.expected
diff --git a/lib/jsoncpp/jsoncpp/test/data/test_integer_02.json b/lib/jsoncpp/test/data/test_integer_02.json
index 056c850065..056c850065 100644
--- a/lib/jsoncpp/jsoncpp/test/data/test_integer_02.json
+++ b/lib/jsoncpp/test/data/test_integer_02.json
diff --git a/lib/jsoncpp/jsoncpp/test/data/test_integer_03.expected b/lib/jsoncpp/test/data/test_integer_03.expected
index 37c1cb146b..37c1cb146b 100644
--- a/lib/jsoncpp/jsoncpp/test/data/test_integer_03.expected
+++ b/lib/jsoncpp/test/data/test_integer_03.expected
diff --git a/lib/jsoncpp/jsoncpp/test/data/test_integer_03.json b/lib/jsoncpp/test/data/test_integer_03.json
index 12ef3fbb89..12ef3fbb89 100644
--- a/lib/jsoncpp/jsoncpp/test/data/test_integer_03.json
+++ b/lib/jsoncpp/test/data/test_integer_03.json
diff --git a/lib/jsoncpp/jsoncpp/test/data/test_integer_04.expected b/lib/jsoncpp/test/data/test_integer_04.expected
index b7b548e3d3..b7b548e3d3 100644
--- a/lib/jsoncpp/jsoncpp/test/data/test_integer_04.expected
+++ b/lib/jsoncpp/test/data/test_integer_04.expected
diff --git a/lib/jsoncpp/jsoncpp/test/data/test_integer_04.json b/lib/jsoncpp/test/data/test_integer_04.json
index bf81499453..bf81499453 100644
--- a/lib/jsoncpp/jsoncpp/test/data/test_integer_04.json
+++ b/lib/jsoncpp/test/data/test_integer_04.json
diff --git a/lib/jsoncpp/jsoncpp/test/data/test_integer_05.expected b/lib/jsoncpp/test/data/test_integer_05.expected
index 0caea9d3fd..0caea9d3fd 100644
--- a/lib/jsoncpp/jsoncpp/test/data/test_integer_05.expected
+++ b/lib/jsoncpp/test/data/test_integer_05.expected
diff --git a/lib/jsoncpp/jsoncpp/test/data/test_integer_05.json b/lib/jsoncpp/test/data/test_integer_05.json
index d474e1b4d6..d474e1b4d6 100644
--- a/lib/jsoncpp/jsoncpp/test/data/test_integer_05.json
+++ b/lib/jsoncpp/test/data/test_integer_05.json
diff --git a/lib/jsoncpp/jsoncpp/test/data/test_object_01.expected b/lib/jsoncpp/test/data/test_object_01.expected
index 67444e5794..67444e5794 100644
--- a/lib/jsoncpp/jsoncpp/test/data/test_object_01.expected
+++ b/lib/jsoncpp/test/data/test_object_01.expected
diff --git a/lib/jsoncpp/jsoncpp/test/data/test_object_01.json b/lib/jsoncpp/test/data/test_object_01.json
index 0967ef424b..0967ef424b 100644
--- a/lib/jsoncpp/jsoncpp/test/data/test_object_01.json
+++ b/lib/jsoncpp/test/data/test_object_01.json
diff --git a/lib/jsoncpp/jsoncpp/test/data/test_object_02.expected b/lib/jsoncpp/test/data/test_object_02.expected
index 79391c2a6c..79391c2a6c 100644
--- a/lib/jsoncpp/jsoncpp/test/data/test_object_02.expected
+++ b/lib/jsoncpp/test/data/test_object_02.expected
diff --git a/lib/jsoncpp/jsoncpp/test/data/test_object_02.json b/lib/jsoncpp/test/data/test_object_02.json
index d0f2facac3..d0f2facac3 100644
--- a/lib/jsoncpp/jsoncpp/test/data/test_object_02.json
+++ b/lib/jsoncpp/test/data/test_object_02.json
diff --git a/lib/jsoncpp/jsoncpp/test/data/test_object_03.expected b/lib/jsoncpp/test/data/test_object_03.expected
index 5e96113792..5e96113792 100644
--- a/lib/jsoncpp/jsoncpp/test/data/test_object_03.expected
+++ b/lib/jsoncpp/test/data/test_object_03.expected
diff --git a/lib/jsoncpp/jsoncpp/test/data/test_object_03.json b/lib/jsoncpp/test/data/test_object_03.json
index 4fcd4d821d..4fcd4d821d 100644
--- a/lib/jsoncpp/jsoncpp/test/data/test_object_03.json
+++ b/lib/jsoncpp/test/data/test_object_03.json
diff --git a/lib/jsoncpp/jsoncpp/test/data/test_object_04.expected b/lib/jsoncpp/test/data/test_object_04.expected
index 812965b0ca..812965b0ca 100644
--- a/lib/jsoncpp/jsoncpp/test/data/test_object_04.expected
+++ b/lib/jsoncpp/test/data/test_object_04.expected
diff --git a/lib/jsoncpp/jsoncpp/test/data/test_object_04.json b/lib/jsoncpp/test/data/test_object_04.json
index 450762d71e..450762d71e 100644
--- a/lib/jsoncpp/jsoncpp/test/data/test_object_04.json
+++ b/lib/jsoncpp/test/data/test_object_04.json
diff --git a/lib/jsoncpp/jsoncpp/test/data/test_preserve_comment_01.expected b/lib/jsoncpp/test/data/test_preserve_comment_01.expected
index 8d88041086..8d88041086 100644
--- a/lib/jsoncpp/jsoncpp/test/data/test_preserve_comment_01.expected
+++ b/lib/jsoncpp/test/data/test_preserve_comment_01.expected
diff --git a/lib/jsoncpp/jsoncpp/test/data/test_preserve_comment_01.json b/lib/jsoncpp/test/data/test_preserve_comment_01.json
index fabd55dd96..fabd55dd96 100644
--- a/lib/jsoncpp/jsoncpp/test/data/test_preserve_comment_01.json
+++ b/lib/jsoncpp/test/data/test_preserve_comment_01.json
diff --git a/lib/jsoncpp/jsoncpp/test/data/test_real_01.expected b/lib/jsoncpp/test/data/test_real_01.expected
index ae2357231e..ae2357231e 100644
--- a/lib/jsoncpp/jsoncpp/test/data/test_real_01.expected
+++ b/lib/jsoncpp/test/data/test_real_01.expected
diff --git a/lib/jsoncpp/jsoncpp/test/data/test_real_01.json b/lib/jsoncpp/test/data/test_real_01.json
index 358452d387..358452d387 100644
--- a/lib/jsoncpp/jsoncpp/test/data/test_real_01.json
+++ b/lib/jsoncpp/test/data/test_real_01.json
diff --git a/lib/jsoncpp/jsoncpp/test/data/test_real_02.expected b/lib/jsoncpp/test/data/test_real_02.expected
index df8de42109..df8de42109 100644
--- a/lib/jsoncpp/jsoncpp/test/data/test_real_02.expected
+++ b/lib/jsoncpp/test/data/test_real_02.expected
diff --git a/lib/jsoncpp/jsoncpp/test/data/test_real_02.json b/lib/jsoncpp/test/data/test_real_02.json
index 936c706b68..936c706b68 100644
--- a/lib/jsoncpp/jsoncpp/test/data/test_real_02.json
+++ b/lib/jsoncpp/test/data/test_real_02.json
diff --git a/lib/jsoncpp/jsoncpp/test/data/test_real_03.expected b/lib/jsoncpp/test/data/test_real_03.expected
index df8de42109..df8de42109 100644
--- a/lib/jsoncpp/jsoncpp/test/data/test_real_03.expected
+++ b/lib/jsoncpp/test/data/test_real_03.expected
diff --git a/lib/jsoncpp/jsoncpp/test/data/test_real_03.json b/lib/jsoncpp/test/data/test_real_03.json
index 936c706b68..936c706b68 100644
--- a/lib/jsoncpp/jsoncpp/test/data/test_real_03.json
+++ b/lib/jsoncpp/test/data/test_real_03.json
diff --git a/lib/jsoncpp/jsoncpp/test/data/test_real_04.expected b/lib/jsoncpp/test/data/test_real_04.expected
index d726abe40b..d726abe40b 100644
--- a/lib/jsoncpp/jsoncpp/test/data/test_real_04.expected
+++ b/lib/jsoncpp/test/data/test_real_04.expected
diff --git a/lib/jsoncpp/jsoncpp/test/data/test_real_04.json b/lib/jsoncpp/test/data/test_real_04.json
index a8eb6d0c92..a8eb6d0c92 100644
--- a/lib/jsoncpp/jsoncpp/test/data/test_real_04.json
+++ b/lib/jsoncpp/test/data/test_real_04.json
diff --git a/lib/jsoncpp/jsoncpp/test/data/test_real_05.expected b/lib/jsoncpp/test/data/test_real_05.expected
index 949fd8f55d..949fd8f55d 100644
--- a/lib/jsoncpp/jsoncpp/test/data/test_real_05.expected
+++ b/lib/jsoncpp/test/data/test_real_05.expected
diff --git a/lib/jsoncpp/jsoncpp/test/data/test_real_05.json b/lib/jsoncpp/test/data/test_real_05.json
index f7923bab89..f7923bab89 100644
--- a/lib/jsoncpp/jsoncpp/test/data/test_real_05.json
+++ b/lib/jsoncpp/test/data/test_real_05.json
diff --git a/lib/jsoncpp/jsoncpp/test/data/test_real_06.expected b/lib/jsoncpp/test/data/test_real_06.expected
index 03b7d7f987..03b7d7f987 100644
--- a/lib/jsoncpp/jsoncpp/test/data/test_real_06.expected
+++ b/lib/jsoncpp/test/data/test_real_06.expected
diff --git a/lib/jsoncpp/jsoncpp/test/data/test_real_06.json b/lib/jsoncpp/test/data/test_real_06.json
index 485419a276..485419a276 100644
--- a/lib/jsoncpp/jsoncpp/test/data/test_real_06.json
+++ b/lib/jsoncpp/test/data/test_real_06.json
diff --git a/lib/jsoncpp/jsoncpp/test/data/test_real_07.expected b/lib/jsoncpp/test/data/test_real_07.expected
index 12025a404b..12025a404b 100644
--- a/lib/jsoncpp/jsoncpp/test/data/test_real_07.expected
+++ b/lib/jsoncpp/test/data/test_real_07.expected
diff --git a/lib/jsoncpp/jsoncpp/test/data/test_real_07.json b/lib/jsoncpp/test/data/test_real_07.json
index 8013eb5c9a..8013eb5c9a 100644
--- a/lib/jsoncpp/jsoncpp/test/data/test_real_07.json
+++ b/lib/jsoncpp/test/data/test_real_07.json
diff --git a/lib/jsoncpp/jsoncpp/test/data/test_string_01.expected b/lib/jsoncpp/test/data/test_string_01.expected
index 8fd37b1e0e..8fd37b1e0e 100644
--- a/lib/jsoncpp/jsoncpp/test/data/test_string_01.expected
+++ b/lib/jsoncpp/test/data/test_string_01.expected
diff --git a/lib/jsoncpp/jsoncpp/test/data/test_string_01.json b/lib/jsoncpp/test/data/test_string_01.json
index 6cd0db44df..6cd0db44df 100644
--- a/lib/jsoncpp/jsoncpp/test/data/test_string_01.json
+++ b/lib/jsoncpp/test/data/test_string_01.json
diff --git a/lib/jsoncpp/jsoncpp/test/data/test_string_02.expected b/lib/jsoncpp/test/data/test_string_02.expected
index 0443bc3649..0443bc3649 100644
--- a/lib/jsoncpp/jsoncpp/test/data/test_string_02.expected
+++ b/lib/jsoncpp/test/data/test_string_02.expected
diff --git a/lib/jsoncpp/jsoncpp/test/data/test_string_02.json b/lib/jsoncpp/test/data/test_string_02.json
index 9a7e5dcad4..9a7e5dcad4 100644
--- a/lib/jsoncpp/jsoncpp/test/data/test_string_02.json
+++ b/lib/jsoncpp/test/data/test_string_02.json
diff --git a/lib/jsoncpp/jsoncpp/test/data/test_string_unicode_01.expected b/lib/jsoncpp/test/data/test_string_unicode_01.expected
index 1f3be7fb68..1f3be7fb68 100644
--- a/lib/jsoncpp/jsoncpp/test/data/test_string_unicode_01.expected
+++ b/lib/jsoncpp/test/data/test_string_unicode_01.expected
diff --git a/lib/jsoncpp/jsoncpp/test/data/test_string_unicode_01.json b/lib/jsoncpp/test/data/test_string_unicode_01.json
index 024114bc09..024114bc09 100644
--- a/lib/jsoncpp/jsoncpp/test/data/test_string_unicode_01.json
+++ b/lib/jsoncpp/test/data/test_string_unicode_01.json
diff --git a/lib/jsoncpp/jsoncpp/test/data/test_string_unicode_02.expected b/lib/jsoncpp/test/data/test_string_unicode_02.expected
index 1388f53943..1388f53943 100644
--- a/lib/jsoncpp/jsoncpp/test/data/test_string_unicode_02.expected
+++ b/lib/jsoncpp/test/data/test_string_unicode_02.expected
diff --git a/lib/jsoncpp/jsoncpp/test/data/test_string_unicode_02.json b/lib/jsoncpp/test/data/test_string_unicode_02.json
index 4961024fab..4961024fab 100644
--- a/lib/jsoncpp/jsoncpp/test/data/test_string_unicode_02.json
+++ b/lib/jsoncpp/test/data/test_string_unicode_02.json
diff --git a/lib/jsoncpp/jsoncpp/test/data/test_string_unicode_03.expected b/lib/jsoncpp/test/data/test_string_unicode_03.expected
index 9b80b2719f..9b80b2719f 100644
--- a/lib/jsoncpp/jsoncpp/test/data/test_string_unicode_03.expected
+++ b/lib/jsoncpp/test/data/test_string_unicode_03.expected
diff --git a/lib/jsoncpp/jsoncpp/test/data/test_string_unicode_03.json b/lib/jsoncpp/test/data/test_string_unicode_03.json
index e7e1a9e138..e7e1a9e138 100644
--- a/lib/jsoncpp/jsoncpp/test/data/test_string_unicode_03.json
+++ b/lib/jsoncpp/test/data/test_string_unicode_03.json
diff --git a/lib/jsoncpp/jsoncpp/test/data/test_string_unicode_04.expected b/lib/jsoncpp/test/data/test_string_unicode_04.expected
index b9e7fe3b7d..b9e7fe3b7d 100644
--- a/lib/jsoncpp/jsoncpp/test/data/test_string_unicode_04.expected
+++ b/lib/jsoncpp/test/data/test_string_unicode_04.expected
diff --git a/lib/jsoncpp/jsoncpp/test/data/test_string_unicode_04.json b/lib/jsoncpp/test/data/test_string_unicode_04.json
index dae65c5155..dae65c5155 100644
--- a/lib/jsoncpp/jsoncpp/test/data/test_string_unicode_04.json
+++ b/lib/jsoncpp/test/data/test_string_unicode_04.json
diff --git a/lib/jsoncpp/jsoncpp/test/data/test_string_unicode_05.expected b/lib/jsoncpp/test/data/test_string_unicode_05.expected
index e78506524c..e78506524c 100644
--- a/lib/jsoncpp/jsoncpp/test/data/test_string_unicode_05.expected
+++ b/lib/jsoncpp/test/data/test_string_unicode_05.expected
diff --git a/lib/jsoncpp/jsoncpp/test/data/test_string_unicode_05.json b/lib/jsoncpp/test/data/test_string_unicode_05.json
index 8770410946..8770410946 100644
--- a/lib/jsoncpp/jsoncpp/test/data/test_string_unicode_05.json
+++ b/lib/jsoncpp/test/data/test_string_unicode_05.json
diff --git a/lib/jsoncpp/jsoncpp/test/generate_expected.py b/lib/jsoncpp/test/generate_expected.py
index 5b215c4670..5b215c4670 100644
--- a/lib/jsoncpp/jsoncpp/test/generate_expected.py
+++ b/lib/jsoncpp/test/generate_expected.py
diff --git a/lib/jsoncpp/jsoncpp/test/jsonchecker/fail1.json b/lib/jsoncpp/test/jsonchecker/fail1.json
index 6216b865f1..6216b865f1 100644
--- a/lib/jsoncpp/jsoncpp/test/jsonchecker/fail1.json
+++ b/lib/jsoncpp/test/jsonchecker/fail1.json
diff --git a/lib/jsoncpp/jsoncpp/test/jsonchecker/fail10.json b/lib/jsoncpp/test/jsonchecker/fail10.json
index 5d8c0047bd..5d8c0047bd 100644
--- a/lib/jsoncpp/jsoncpp/test/jsonchecker/fail10.json
+++ b/lib/jsoncpp/test/jsonchecker/fail10.json
diff --git a/lib/jsoncpp/jsoncpp/test/jsonchecker/fail11.json b/lib/jsoncpp/test/jsonchecker/fail11.json
index 76eb95b458..76eb95b458 100644
--- a/lib/jsoncpp/jsoncpp/test/jsonchecker/fail11.json
+++ b/lib/jsoncpp/test/jsonchecker/fail11.json
diff --git a/lib/jsoncpp/jsoncpp/test/jsonchecker/fail12.json b/lib/jsoncpp/test/jsonchecker/fail12.json
index 77580a4522..77580a4522 100644
--- a/lib/jsoncpp/jsoncpp/test/jsonchecker/fail12.json
+++ b/lib/jsoncpp/test/jsonchecker/fail12.json
diff --git a/lib/jsoncpp/jsoncpp/test/jsonchecker/fail13.json b/lib/jsoncpp/test/jsonchecker/fail13.json
index 379406b59b..379406b59b 100644
--- a/lib/jsoncpp/jsoncpp/test/jsonchecker/fail13.json
+++ b/lib/jsoncpp/test/jsonchecker/fail13.json
diff --git a/lib/jsoncpp/jsoncpp/test/jsonchecker/fail14.json b/lib/jsoncpp/test/jsonchecker/fail14.json
index 0ed366b38a..0ed366b38a 100644
--- a/lib/jsoncpp/jsoncpp/test/jsonchecker/fail14.json
+++ b/lib/jsoncpp/test/jsonchecker/fail14.json
diff --git a/lib/jsoncpp/jsoncpp/test/jsonchecker/fail15.json b/lib/jsoncpp/test/jsonchecker/fail15.json
index fc8376b605..fc8376b605 100644
--- a/lib/jsoncpp/jsoncpp/test/jsonchecker/fail15.json
+++ b/lib/jsoncpp/test/jsonchecker/fail15.json
diff --git a/lib/jsoncpp/jsoncpp/test/jsonchecker/fail16.json b/lib/jsoncpp/test/jsonchecker/fail16.json
index 3fe21d4b53..3fe21d4b53 100644
--- a/lib/jsoncpp/jsoncpp/test/jsonchecker/fail16.json
+++ b/lib/jsoncpp/test/jsonchecker/fail16.json
diff --git a/lib/jsoncpp/jsoncpp/test/jsonchecker/fail17.json b/lib/jsoncpp/test/jsonchecker/fail17.json
index 62b9214aed..62b9214aed 100644
--- a/lib/jsoncpp/jsoncpp/test/jsonchecker/fail17.json
+++ b/lib/jsoncpp/test/jsonchecker/fail17.json
diff --git a/lib/jsoncpp/jsoncpp/test/jsonchecker/fail18.json b/lib/jsoncpp/test/jsonchecker/fail18.json
index edac92716f..edac92716f 100644
--- a/lib/jsoncpp/jsoncpp/test/jsonchecker/fail18.json
+++ b/lib/jsoncpp/test/jsonchecker/fail18.json
diff --git a/lib/jsoncpp/jsoncpp/test/jsonchecker/fail19.json b/lib/jsoncpp/test/jsonchecker/fail19.json
index 3b9c46fa9a..3b9c46fa9a 100644
--- a/lib/jsoncpp/jsoncpp/test/jsonchecker/fail19.json
+++ b/lib/jsoncpp/test/jsonchecker/fail19.json
diff --git a/lib/jsoncpp/jsoncpp/test/jsonchecker/fail2.json b/lib/jsoncpp/test/jsonchecker/fail2.json
index 6b7c11e5a5..6b7c11e5a5 100644
--- a/lib/jsoncpp/jsoncpp/test/jsonchecker/fail2.json
+++ b/lib/jsoncpp/test/jsonchecker/fail2.json
diff --git a/lib/jsoncpp/jsoncpp/test/jsonchecker/fail20.json b/lib/jsoncpp/test/jsonchecker/fail20.json
index 27c1af3e72..27c1af3e72 100644
--- a/lib/jsoncpp/jsoncpp/test/jsonchecker/fail20.json
+++ b/lib/jsoncpp/test/jsonchecker/fail20.json
diff --git a/lib/jsoncpp/jsoncpp/test/jsonchecker/fail21.json b/lib/jsoncpp/test/jsonchecker/fail21.json
index 62474573b2..62474573b2 100644
--- a/lib/jsoncpp/jsoncpp/test/jsonchecker/fail21.json
+++ b/lib/jsoncpp/test/jsonchecker/fail21.json
diff --git a/lib/jsoncpp/jsoncpp/test/jsonchecker/fail22.json b/lib/jsoncpp/test/jsonchecker/fail22.json
index a7752581bc..a7752581bc 100644
--- a/lib/jsoncpp/jsoncpp/test/jsonchecker/fail22.json
+++ b/lib/jsoncpp/test/jsonchecker/fail22.json
diff --git a/lib/jsoncpp/jsoncpp/test/jsonchecker/fail23.json b/lib/jsoncpp/test/jsonchecker/fail23.json
index 494add1ca1..494add1ca1 100644
--- a/lib/jsoncpp/jsoncpp/test/jsonchecker/fail23.json
+++ b/lib/jsoncpp/test/jsonchecker/fail23.json
diff --git a/lib/jsoncpp/jsoncpp/test/jsonchecker/fail24.json b/lib/jsoncpp/test/jsonchecker/fail24.json
index caff239bfc..caff239bfc 100644
--- a/lib/jsoncpp/jsoncpp/test/jsonchecker/fail24.json
+++ b/lib/jsoncpp/test/jsonchecker/fail24.json
diff --git a/lib/jsoncpp/jsoncpp/test/jsonchecker/fail25.json b/lib/jsoncpp/test/jsonchecker/fail25.json
index 8b7ad23e01..8b7ad23e01 100644
--- a/lib/jsoncpp/jsoncpp/test/jsonchecker/fail25.json
+++ b/lib/jsoncpp/test/jsonchecker/fail25.json
diff --git a/lib/jsoncpp/jsoncpp/test/jsonchecker/fail26.json b/lib/jsoncpp/test/jsonchecker/fail26.json
index 845d26a6a5..845d26a6a5 100644
--- a/lib/jsoncpp/jsoncpp/test/jsonchecker/fail26.json
+++ b/lib/jsoncpp/test/jsonchecker/fail26.json
diff --git a/lib/jsoncpp/jsoncpp/test/jsonchecker/fail27.json b/lib/jsoncpp/test/jsonchecker/fail27.json
index 6b01a2ca4a..6b01a2ca4a 100644
--- a/lib/jsoncpp/jsoncpp/test/jsonchecker/fail27.json
+++ b/lib/jsoncpp/test/jsonchecker/fail27.json
diff --git a/lib/jsoncpp/jsoncpp/test/jsonchecker/fail28.json b/lib/jsoncpp/test/jsonchecker/fail28.json
index 621a0101c6..621a0101c6 100644
--- a/lib/jsoncpp/jsoncpp/test/jsonchecker/fail28.json
+++ b/lib/jsoncpp/test/jsonchecker/fail28.json
diff --git a/lib/jsoncpp/jsoncpp/test/jsonchecker/fail29.json b/lib/jsoncpp/test/jsonchecker/fail29.json
index 47ec421bb6..47ec421bb6 100644
--- a/lib/jsoncpp/jsoncpp/test/jsonchecker/fail29.json
+++ b/lib/jsoncpp/test/jsonchecker/fail29.json
diff --git a/lib/jsoncpp/jsoncpp/test/jsonchecker/fail3.json b/lib/jsoncpp/test/jsonchecker/fail3.json
index 168c81eb78..168c81eb78 100644
--- a/lib/jsoncpp/jsoncpp/test/jsonchecker/fail3.json
+++ b/lib/jsoncpp/test/jsonchecker/fail3.json
diff --git a/lib/jsoncpp/jsoncpp/test/jsonchecker/fail30.json b/lib/jsoncpp/test/jsonchecker/fail30.json
index 8ab0bc4b8b..8ab0bc4b8b 100644
--- a/lib/jsoncpp/jsoncpp/test/jsonchecker/fail30.json
+++ b/lib/jsoncpp/test/jsonchecker/fail30.json
diff --git a/lib/jsoncpp/jsoncpp/test/jsonchecker/fail31.json b/lib/jsoncpp/test/jsonchecker/fail31.json
index 1cce602b51..1cce602b51 100644
--- a/lib/jsoncpp/jsoncpp/test/jsonchecker/fail31.json
+++ b/lib/jsoncpp/test/jsonchecker/fail31.json
diff --git a/lib/jsoncpp/jsoncpp/test/jsonchecker/fail32.json b/lib/jsoncpp/test/jsonchecker/fail32.json
index 45cba7396f..45cba7396f 100644
--- a/lib/jsoncpp/jsoncpp/test/jsonchecker/fail32.json
+++ b/lib/jsoncpp/test/jsonchecker/fail32.json
diff --git a/lib/jsoncpp/jsoncpp/test/jsonchecker/fail33.json b/lib/jsoncpp/test/jsonchecker/fail33.json
index ca5eb19dc9..ca5eb19dc9 100644
--- a/lib/jsoncpp/jsoncpp/test/jsonchecker/fail33.json
+++ b/lib/jsoncpp/test/jsonchecker/fail33.json
diff --git a/lib/jsoncpp/jsoncpp/test/jsonchecker/fail4.json b/lib/jsoncpp/test/jsonchecker/fail4.json
index 9de168bf34..9de168bf34 100644
--- a/lib/jsoncpp/jsoncpp/test/jsonchecker/fail4.json
+++ b/lib/jsoncpp/test/jsonchecker/fail4.json
diff --git a/lib/jsoncpp/jsoncpp/test/jsonchecker/fail5.json b/lib/jsoncpp/test/jsonchecker/fail5.json
index ddf3ce3d24..ddf3ce3d24 100644
--- a/lib/jsoncpp/jsoncpp/test/jsonchecker/fail5.json
+++ b/lib/jsoncpp/test/jsonchecker/fail5.json
diff --git a/lib/jsoncpp/jsoncpp/test/jsonchecker/fail6.json b/lib/jsoncpp/test/jsonchecker/fail6.json
index ed91580e1b..ed91580e1b 100644
--- a/lib/jsoncpp/jsoncpp/test/jsonchecker/fail6.json
+++ b/lib/jsoncpp/test/jsonchecker/fail6.json
diff --git a/lib/jsoncpp/jsoncpp/test/jsonchecker/fail7.json b/lib/jsoncpp/test/jsonchecker/fail7.json
index 8a96af3e4e..8a96af3e4e 100644
--- a/lib/jsoncpp/jsoncpp/test/jsonchecker/fail7.json
+++ b/lib/jsoncpp/test/jsonchecker/fail7.json
diff --git a/lib/jsoncpp/jsoncpp/test/jsonchecker/fail8.json b/lib/jsoncpp/test/jsonchecker/fail8.json
index b28479c6ec..b28479c6ec 100644
--- a/lib/jsoncpp/jsoncpp/test/jsonchecker/fail8.json
+++ b/lib/jsoncpp/test/jsonchecker/fail8.json
diff --git a/lib/jsoncpp/jsoncpp/test/jsonchecker/fail9.json b/lib/jsoncpp/test/jsonchecker/fail9.json
index 5815574f36..5815574f36 100644
--- a/lib/jsoncpp/jsoncpp/test/jsonchecker/fail9.json
+++ b/lib/jsoncpp/test/jsonchecker/fail9.json
diff --git a/lib/jsoncpp/jsoncpp/test/jsonchecker/pass1.json b/lib/jsoncpp/test/jsonchecker/pass1.json
index 70e2685436..70e2685436 100644
--- a/lib/jsoncpp/jsoncpp/test/jsonchecker/pass1.json
+++ b/lib/jsoncpp/test/jsonchecker/pass1.json
diff --git a/lib/jsoncpp/jsoncpp/test/jsonchecker/pass2.json b/lib/jsoncpp/test/jsonchecker/pass2.json
index d3c63c7ad8..d3c63c7ad8 100644
--- a/lib/jsoncpp/jsoncpp/test/jsonchecker/pass2.json
+++ b/lib/jsoncpp/test/jsonchecker/pass2.json
diff --git a/lib/jsoncpp/jsoncpp/test/jsonchecker/pass3.json b/lib/jsoncpp/test/jsonchecker/pass3.json
index 4528d51f1a..4528d51f1a 100644
--- a/lib/jsoncpp/jsoncpp/test/jsonchecker/pass3.json
+++ b/lib/jsoncpp/test/jsonchecker/pass3.json
diff --git a/lib/jsoncpp/jsoncpp/test/jsonchecker/readme.txt b/lib/jsoncpp/test/jsonchecker/readme.txt
index 321d89d998..321d89d998 100644
--- a/lib/jsoncpp/jsoncpp/test/jsonchecker/readme.txt
+++ b/lib/jsoncpp/test/jsonchecker/readme.txt
diff --git a/lib/jsoncpp/jsoncpp/test/jsontestrunner.py b/lib/jsoncpp/test/jsontestrunner.py
index 504f3db2e7..504f3db2e7 100644
--- a/lib/jsoncpp/jsoncpp/test/jsontestrunner.py
+++ b/lib/jsoncpp/test/jsontestrunner.py
diff --git a/lib/jsoncpp/jsoncpp/test/runjsontests.py b/lib/jsoncpp/test/runjsontests.py
index e05bd52b48..e05bd52b48 100644
--- a/lib/jsoncpp/jsoncpp/test/runjsontests.py
+++ b/lib/jsoncpp/test/runjsontests.py
diff --git a/lib/jsoncpp/jsoncpp/test/rununittests.py b/lib/jsoncpp/test/rununittests.py
index 366184cfb5..366184cfb5 100644
--- a/lib/jsoncpp/jsoncpp/test/rununittests.py
+++ b/lib/jsoncpp/test/rununittests.py