Core/Scripting: Some cleanup
Merge branch 'master' of git://github.com/TrinityCore/TrinityCore