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

src/viewport_sprite_sorter.h

@@ -47,8 +47,8 @@ struct __attribute__ ((aligned (16))) ParentSpriteToDraw {
 	bool IsComparisonDone() const { return HasBit(this->height, 15); }
 	void SetComparisonDone(bool done) { SB(this->height, 15, 1, done ? 1 : 0); }
 };
-assert_compile((sizeof(ParentSpriteToDraw) % 16) == 0);
-assert_compile(sizeof(ParentSpriteToDraw) <= 64);
+static_assert((sizeof(ParentSpriteToDraw) % 16) == 0);
+static_assert(sizeof(ParentSpriteToDraw) <= 64);
 
 typedef std::vector<ParentSpriteToDraw*> ParentSpriteToSortVector;