Merge pull request #1 from cmangos/master

Update