Merge branch 'master' into jgrpp

# Conflicts:
#	src/company_cmd.cpp
#	src/company_func.h
#	src/core/overflowsafe_type.hpp
#	src/engine.cpp
#	src/music/midifile.cpp
#	src/network/network_command.cpp
#	src/newgrf_debug_gui.cpp
#	src/newgrf_roadstop.h
#	src/newgrf_spritegroup.cpp
#	src/os/macosx/crashlog_osx.cpp
#	src/os/unix/crashlog_unix.cpp
#	src/pathfinder/yapf/yapf_common.hpp
#	src/road_gui.cpp
#	src/saveload/engine_sl.cpp
#	src/script/api/script_depotlist.cpp
#	src/script/api/script_roadtypelist.cpp
#	src/settings_gui.cpp
#	src/settings_type.h
#	src/strings.cpp
#	src/table/settings/game_settings.ini

src/widgets/dropdown_type.h

@@ -127,12 +127,12 @@ public:
 	void SetColourFlags(TextColour colour_flags) { this->colour_flags = colour_flags; }
 
 	/**
-	* Natural sorting comparator function for DropDownList::sort().
-	* @param first Left side of comparison.
-	* @param second Right side of comparison.
-	* @return true if \a first precedes \a second.
-	* @warning All items in the list need to be derivates of DropDownListStringItem.
-	*/
+	 * Natural sorting comparator function for DropDownList::sort().
+	 * @param first Left side of comparison.
+	 * @param second Right side of comparison.
+	 * @return true if \a first precedes \a second.
+	 * @warning All items in the list need to be derivates of DropDownListStringItem.
+	 */
 	static bool NatSortFunc(std::unique_ptr<const DropDownListItem> const &first, std::unique_ptr<const DropDownListItem> const &second)
 	{
 		const std::string &str1 = static_cast<const DropDownString*>(first.get())->string;