Merge pull request #4 from cala/master

Three backports from Classic DB and 7 backports from ACID WotLK