Merge pull request #3816 from danrl/wireguard