Merge branch 'master' into jgrpp-nrt

# Conflicts:
#	src/fontcache.cpp
#	src/game/game_text.cpp
#	src/lang/korean.txt
#	src/os/macosx/crashlog_osx.cpp
#	src/os/windows/crashlog_win.cpp
#	src/station_cmd.cpp
#	src/viewport.cpp

src/table/settings.ini

@@ -2300,6 +2300,21 @@ strhelp  = STR_CONFIG_SETTING_SCRIPT_MAX_OPCODES_HELPTEXT
 strval   = STR_JUST_COMMA
 cat      = SC_EXPERT
 
+[SDT_VAR]
+base     = GameSettings
+var      = script.script_max_memory_megabytes
+type     = SLE_UINT32
+from     = SLV_SCRIPT_MEMLIMIT
+guiflags = SGF_NEWGAME_ONLY
+def      = 1024
+min      = 8
+max      = 8192
+interval = 8
+str      = STR_CONFIG_SETTING_SCRIPT_MAX_MEMORY
+strhelp  = STR_CONFIG_SETTING_SCRIPT_MAX_MEMORY_HELPTEXT
+strval   = STR_CONFIG_SETTING_SCRIPT_MAX_MEMORY_VALUE
+cat      = SC_EXPERT
+
 ##
 [SDT_VAR]
 base     = GameSettings
@@ -3451,6 +3466,7 @@ max      = 3
 str      = STR_CONFIG_SETTING_SCROLLMODE
 strhelp  = STR_CONFIG_SETTING_SCROLLMODE_HELPTEXT
 strval   = STR_CONFIG_SETTING_SCROLLMODE_DEFAULT
+cat      = SC_BASIC
 
 [SDTC_BOOL]
 var      = gui.smooth_scroll
@@ -5039,7 +5055,7 @@ var      = network.lan_internet
 type     = SLE_UINT8
 flags    = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
 guiflags = SGF_NETWORK_ONLY
-def      = 0
+def      = 1
 min      = 0
 max      = 1