Merge pull request #9639 from mwarning/zerotier