Merge remote-tracking branch 'origin/master'

Conflicts:
	config.php
	fetchnode.php
	nodedetail.php
	ssh.php