Merge branch 'MasteryAdjustment' into 'master'

Mastery fix

Minor fixes/adjustments to combatDamage.

The new formula may not be perfect but it does seem to be doing what its intended to do so I doubt any dramatic changes to it for 1.6 will be necessary.

See merge request !476