merge from mangoszero

Signed-off-by: Schmoozerd <schmoozerd@cmangos>