Merge branch '3.8' into 4.0-beta

spine-cpp/spine-cpp/src/spine/Json.cpp

@@ -120,7 +120,7 @@ Json::Json(const char *value) :
 }
 
 Json::~Json() {
-    spine::Json* curr = nullptr;
+    spine::Json* curr = NULL;
     spine::Json* next = _child;
     do {
         curr = next;

spine-cpp/spine-cpp/src/spine/SkeletonBinary.cpp

@@ -380,7 +380,7 @@ char *SkeletonBinary::readString(DataInput *input) {
 
 char* SkeletonBinary::readStringRef(DataInput* input, SkeletonData* skeletonData) {
 	int index = readVarint(input, true);
-	return index == 0 ? nullptr : skeletonData->_strings[index - 1];
+	return index == 0 ? NULL : skeletonData->_strings[index - 1];
 }
 
 float SkeletonBinary::readFloat(DataInput *input) {