Merge branch 'master' into d3d9ex #49

Job	Run time
build (-DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++, -DCMAKE_BUILD_TYPE=Release)	3m 21s
build (-DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++, -DCMAKE_BUILD_TYPE=Release, -DENABLE_LINK...	3m 8s
build (-DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++, -DCMAKE_BUILD_TYPE=Release, -DENABLE_SDL=ON)	3m 53s
build (-DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++, -DCMAKE_BUILD_TYPE=Debug)	2m 7s
build (-DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++, -DCMAKE_BUILD_TYPE=Debug, -DENABLE_LINK=OFF)	2m 18s
build (-DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++, -DCMAKE_BUILD_TYPE=Debug, -DENABLE_SDL=ON)	2m 25s
build (-DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++, -DCMAKE_BUILD_TYPE=Release)	2m 34s
build (-DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++, -DCMAKE_BUILD_TYPE=Release, -DENABL...	2m 49s
build (-DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++, -DCMAKE_BUILD_TYPE=Release, -DENABL...	2m 54s
build (-DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++, -DCMAKE_BUILD_TYPE=Debug)	2m 0s
build (-DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++, -DCMAKE_BUILD_TYPE=Debug, -DENABLE_...	1m 45s
build (-DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++, -DCMAKE_BUILD_TYPE=Debug, -DENABLE_...	1m 36s
	30m 50s

Provide feedback