Omega via svn r9384:
Fix a couple bugs
Merge branch 'master' of git://git.curseforge.net/wow/deadly-boss-mods/mainline