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/schdispatch_cmd.cpp

@@ -30,7 +30,7 @@
 /* We squeeze this amount into 14 bit of data, so we must guarantee that
    DAY_TICKS * (max_day_length_factor+1) can fit in 14-bit
    See CmdScheduledDispatchSetStartDate */
-assert_compile(DAY_TICKS * 126 < 16384);
+static_assert(DAY_TICKS * 126 < 16384);
 
 /**
  * Enable or disable scheduled dispatch
@@ -166,7 +166,7 @@ CommandCost CmdScheduledDispatchSetDuration(TileIndex tile, DoCommandFlag flags,
  * which only have topmost bit available. However, if the date reached 31 bits, that means it is over 1,000,000 years,
  * so I think it is safe to steal another bit here.
  *
- * See also the assert_compile at the top of the file.
+ * See also the static_assert at the top of the file.
  *
  * @param tile Not used.
  * @param flags Operation to perform.