Added changes for node name caching
Merge branch 'tmp'

Conflicts:
	wisski_pathbuilder.inc