svn - Revision 15186: /branches/charmerge/npc/battleground