Merge remote-tracking branch 'upstream/master' into i18n

game/engines/default/engine/Calendar.lua

game/engines/default/engine/algorithms/MST.lua

game/engines/default/engine/generator/map/MapScript.lua

game/engines/default/engine/generator/map/Static.lua

game/engines/default/engine/tilemaps/Rooms.lua

game/engines/default/engine/tilemaps/Static.lua

game/engines/default/engine/tilemaps/Tilemap.lua

game/engines/default/engine/utils.lua

game/modules/tome/class/Actor.lua

game/modules/tome/class/NicerTiles.lua

game/modules/tome/class/PartyMember.lua

game/modules/tome/class/Player.lua

game/modules/tome/class/interface/PartyLore.lua

game/modules/tome/class/interface/PlayerQuestPopup.lua

game/modules/tome/data/general/events/glimmerstone.lua

game/modules/tome/data/general/grids/basic.lua

game/modules/tome/data/general/grids/fortress.lua

game/modules/tome/data/general/objects/world-artifacts.lua

.../terrain/marble_water/marble_floor_2_to_water_outer_1.png

.../terrain/marble_water/marble_floor_2_to_water_outer_2.png