Fix spiderfy - merge to master branch

Closed Eric - kg6wxc requested to merge fixSpiderfy2 into master

Merge request reports