Merge branch 'master' into jgrpp

# Conflicts:
#	os/macosx/notarize.sh
#	src/3rdparty/CMakeLists.txt
#	src/3rdparty/squirrel/squirrel/sqcompiler.cpp
#	src/3rdparty/squirrel/squirrel/sqdebug.cpp
#	src/3rdparty/squirrel/squirrel/sqvm.cpp
#	src/console_cmds.cpp
#	src/core/span_type.hpp
#	src/crashlog.cpp
#	src/currency.h
#	src/date_gui.cpp
#	src/driver.cpp
#	src/fios.cpp
#	src/genworld_gui.cpp
#	src/hotkeys.cpp
#	src/misc_gui.cpp
#	src/music/os2_m.cpp
#	src/network/core/os_abstraction.h
#	src/network/network_server.cpp
#	src/newgrf.cpp
#	src/newgrf_config.h
#	src/newgrf_text.cpp
#	src/openttd.cpp
#	src/os/macosx/font_osx.cpp
#	src/os/macosx/misc_osx.cpp
#	src/os/os2/CMakeLists.txt
#	src/os/os2/os2.cpp
#	src/os/unix/CMakeLists.txt
#	src/os/windows/font_win32.cpp
#	src/os/windows/win32_main.cpp
#	src/saveload/saveload.cpp
#	src/script/api/script_text.cpp
#	src/settings.cpp
#	src/settings_gui.cpp
#	src/stdafx.h
#	src/strings.cpp
#	src/timetable_gui.cpp
#	src/town_gui.cpp
#	src/train_cmd.cpp
#	src/video/dedicated_v.cpp
#	src/video/video_driver.cpp
#	src/video/win32_v.cpp
#	src/viewport.cpp
#	src/waypoint_gui.cpp
#	src/widgets/dropdown_type.h
#	src/window.cpp
#	src/window_gui.h

src/ini_load.cpp

@@ -82,22 +82,32 @@ IniGroup::~IniGroup()
 }
 
 /**
- * Get the item with the given name, and if it doesn't exist
- * and create is true it creates a new item.
+ * Get the item with the given name.
  * @param name   name of the item to find.
- * @param create whether to create an item when not found or not.
  * @return the requested item or nullptr if not found.
  */
-IniItem *IniGroup::GetItem(const std::string &name, bool create)
+IniItem *IniGroup::GetItem(const std::string &name) const
 {
 	for (IniItem *item = this->item; item != nullptr; item = item->next) {
 		if (item->name == name) return item;
 	}
 
-	if (!create) return nullptr;
+	return nullptr;
+}
 
-	/* otherwise make a new one */
-	return new IniItem(this, name);
+/**
+ * Get the item with the given name, and if it doesn't exist create a new item.
+ * @param name   name of the item to find.
+ * @return the requested item.
+ */
+IniItem &IniGroup::GetOrCreateItem(const std::string &name)
+{
+	for (IniItem *item = this->item; item != nullptr; item = item->next) {
+		if (item->name == name) return *item;
+	}
+
+	/* Item doesn't exist, make a new one. */
+	return *(new IniItem(this, name));
 }
 
 /**