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

game/modules/tome/class/Actor.lua

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

game/modules/tome/data/general/objects/egos/belt.lua

game/modules/tome/data/general/objects/egos/wands-powers.lua

...es/tome/data/general/objects/world-artifacts-maj-eyal.lua

game/modules/tome/data/gfx/particles/spike_decrepitude.lua

...s/tome/data/gfx/particles_images/spike_of_decrepitude.png

...ata/gfx/shockbolt/shader_images/boneyard_ground_gfx_3.png

...s/tome/data/maps/vaults/auto/greater/sleeping-dragons.lua

game/modules/tome/data/talents/celestial/hymns.lua

game/modules/tome/data/talents/celestial/light.lua

game/modules/tome/data/talents/chronomancy/anomalies.lua

game/modules/tome/data/talents/corruptions/curses.lua

game/modules/tome/data/talents/corruptions/hexes.lua

game/modules/tome/data/talents/gifts/earthen-power.lua

game/modules/tome/data/talents/misc/inscriptions.lua

game/modules/tome/data/talents/spells/age-of-dusk.lua

game/modules/tome/data/talents/spells/arcane.lua

game/modules/tome/data/talents/spells/conveyance.lua

game/modules/tome/data/talents/spells/dreadmaster.lua