Merge remote-tracking branch 'origin/master' into 4.3.4

Conflicts:
	src/server/game/Entities/Unit/Unit.cpp
	src/server/game/Handlers/SkillHandler.cpp

sql/updates/characters/2012_09_07_00_characters_characters.sql

@@ -0,0 +1,2 @@
+ALTER TABLE `characters` MODIFY `name`
+    VARCHAR(12) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL;