Merge branch 'master' into jgrpp

# Conflicts:
#	Makefile.bundle.in
#	src/os/macosx/string_osx.cpp
#	src/station_cmd.cpp

src/table/settings.ini

@@ -1929,6 +1929,20 @@ str      = STR_CONFIG_SETTING_ALLOW_SHARES
 strhelp  = STR_CONFIG_SETTING_ALLOW_SHARES_HELPTEXT
 proc     = InvalidateCompanyWindow
 
+[SDT_VAR]
+base     = GameSettings
+var      = economy.min_years_for_shares
+type     = SLE_UINT8
+from     = SLV_TRADING_AGE
+def      = 6
+min      = 0
+max      = 255
+interval = 1
+str      = STR_CONFIG_SETTING_MIN_YEARS_FOR_SHARES
+strhelp  = STR_CONFIG_SETTING_MIN_YEARS_FOR_SHARES_HELPTEXT
+strval   = STR_JUST_INT
+cat      = SC_EXPERT
+
 [SDT_VAR]
 base     = GameSettings
 var      = economy.feeder_payment_share