Index: binaries/data/mods/public/gui/credits/texts/programming.json
===================================================================
--- binaries/data/mods/public/gui/credits/texts/programming.json
+++ binaries/data/mods/public/gui/credits/texts/programming.json
@@ -84,6 +84,7 @@
 			{"nick": "freenity", "name": "Anton Galitch"},
 			{"nick": "gbish (aka Iny)", "name": "Grant Bishop"},
 			{"nick": "Gee", "name": "Gustav Larsson"},
+			{"nick": "Gentz", "name": "Hal Gentz"},
 			{"nick": "gerbilOFdoom"},
 			{"nick": "godlikeldh"},
 			{"nick": "greybeard", "name": "Joe Cocovich"},
Index: libraries/source/fcollada/src/FCollada/FUtils/FUTracker.h
===================================================================
--- libraries/source/fcollada/src/FCollada/FUtils/FUTracker.h
+++ libraries/source/fcollada/src/FCollada/FUtils/FUTracker.h
@@ -119,7 +119,6 @@
 	FUTrackedPtr(ObjectClass* _ptr = NULL) : ptr(_ptr)
 	{
 		if (ptr != NULL) FUTracker::TrackObject((FUTrackable*) ptr);
-		ptr = ptr;
 	}
 
 	/** Destructor.
Index: libraries/source/fcollada/src/Makefile
===================================================================
--- libraries/source/fcollada/src/Makefile
+++ libraries/source/fcollada/src/Makefile
@@ -8,7 +8,7 @@
 endif
 
 CXX ?= g++
-CXXFLAGS += -fvisibility=hidden -W -Wall -Wno-unused-parameter -Wno-unused-function $(OS_DEFINE) $(PIC_FLAGS) $(CPPFLAGS)
+CXXFLAGS += -fvisibility=hidden -W -Wall -Wno-unused-parameter -Wno-unused-function $(OS_DEFINE) $(PIC_FLAGS) $(CPPFLAGS) -std=c++11
 CXXFLAGS_DEBUG := -O0 -g -D_DEBUG -DRETAIL
 CXXFLAGS_RELEASE := -O2 -DNDEBUG -DRETAIL
 CXXFLAGS_TEST := -O0 -g -D_DEBUG
Index: libraries/source/spidermonkey/build.sh
===================================================================
--- libraries/source/spidermonkey/build.sh
+++ libraries/source/spidermonkey/build.sh
@@ -17,6 +17,14 @@
 echo "Building SpiderMonkey..."
 echo
 
+# Spider monkey doesn't compile with clang 6 currently 
+if [ "$CXX" = "clang++" ]; then
+	if clang++ -v 2>&1 | grep "version 6" -q; then
+		export CXX=
+		export CC=
+	fi
+fi
+
 # Use Mozilla make on Windows
 if [ "${OS}" = "Windows_NT" ]
 then