Merge branch 'master' into d3d9 #61

Job	Run time
build (-DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++, -DCMAKE_BUILD_TYPE=Release)	3m 13s
build (-DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++, -DCMAKE_BUILD_TYPE=Release, -DENABLE_LINK...	3m 9s
build (-DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++, -DCMAKE_BUILD_TYPE=Release, -DENABLE_SDL=ON)	3m 42s
build (-DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++, -DCMAKE_BUILD_TYPE=Debug)	2m 22s
build (-DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++, -DCMAKE_BUILD_TYPE=Debug, -DENABLE_LINK=OFF)	2m 16s
build (-DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++, -DCMAKE_BUILD_TYPE=Debug, -DENABLE_SDL=ON)	1m 56s
build (-DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++, -DCMAKE_BUILD_TYPE=Release)	2m 48s
build (-DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++, -DCMAKE_BUILD_TYPE=Release, -DENABL...	3m 16s
build (-DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++, -DCMAKE_BUILD_TYPE=Release, -DENABL...	2m 51s
build (-DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++, -DCMAKE_BUILD_TYPE=Debug)	2m 24s
build (-DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++, -DCMAKE_BUILD_TYPE=Debug, -DENABLE_...	1m 35s
build (-DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++, -DCMAKE_BUILD_TYPE=Debug, -DENABLE_...	1m 48s
	31m 20s

Provide feedback