Display: properly update the display when entering combat.
Merge branch 'master' of github.com:Adirelle/AdiButtonAuras