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

# Conflicts:
#	game/modules/tome/data/talents/psionic/psi-fighting.lua
#	game/modules/tome/data/talents/techniques/2hweapon.lua
#	game/modules/tome/data/talents/techniques/strength-of-the-berserker.lua