Merge branch 'master' into jgrpp

# Conflicts:
#	cmake/CompileFlags.cmake
#	src/crashlog.cpp
#	src/fileio.cpp
#	src/fileio_func.h
#	src/fios_gui.cpp
#	src/ini_load.cpp
#	src/ini_type.h
#	src/lang/english.txt
#	src/lang/german.txt
#	src/lang/korean.txt
#	src/network/network_client.cpp
#	src/order_base.h
#	src/order_cmd.cpp
#	src/os/windows/win32.cpp
#	src/road_cmd.cpp
#	src/saveload/saveload.cpp
#	src/saveload/saveload.h
#	src/settings.cpp
#	src/station_cmd.cpp
#	src/stdafx.h
#	src/table/settings.ini
#	src/tree_cmd.cpp
#	src/tree_gui.cpp
#	src/vehicle_base.h
#	src/video/cocoa/cocoa_v.mm
#	src/video/cocoa/event.mm
#	src/video/cocoa/wnd_quartz.mm
#	src/viewport.cpp
#	src/widgets/tree_widget.h

cmake/CompileFlags.cmake

@@ -133,10 +133,20 @@ macro(compile_flags)
             )
         endif()
 
-        if(APPLE)
+        if(CMAKE_CXX_COMPILER_ID STREQUAL "AppleClang")
             add_compile_options(
                 -fno-stack-check
             )
+
+            include(CheckCXXCompilerFlag)
+            check_cxx_compiler_flag("-mno-sse4" NO_SSE4_FOUND)
+
+            if(NO_SSE4_FOUND)
+                add_compile_options(
+                    # Don't use SSE4 for general sources to increase compatibility.
+                    -mno-sse4
+                )
+            endif()
         endif()
     elseif(CMAKE_CXX_COMPILER_ID STREQUAL "Intel")
         add_compile_options(