merge from core NaxxMare

some crash fixes from Ladel and Ameron