Merge branch 'tree-npc' into stable-test

Conflicts:
	npcs.xml