Retail compatibility adjustments (Merchant API, PvP taint, Secret guards)#135

SpeedysGames wants to merge 6 commits intoShadow-and-Light:devShadow-and-Light/shadow-and-light:devfrom

SpeedysGames:devSpeedysGames/shadow-and-light:devCopy head branch name to clipboard