Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4

Conflicts:
	src/server/scripts/EasternKingdoms/ZulAman/zulaman.cpp

src/server/scripts/Commands/cs_wp.cpp

@@ -800,7 +800,7 @@ public:
         if (show == "info")
         {
             // Check if the user did specify a visual waypoint
-            if (target && target->GetEntry() != VISUAL_WAYPOINT)
+            if (!target || target->GetEntry() != VISUAL_WAYPOINT)
             {
                 handler->PSendSysMessage(LANG_WAYPOINT_VP_SELECT);
                 handler->SetSentErrorMessage(true);