Core/Auctionhouse: Better fix for 809fb9894ec5ee5a
Merge branch 'master' of https://github.com/TrinityCore/TrinityCore into ghbb

Conflicts:
	src/server/game/Entities/Player/Player.cpp