Merge pull request #947 from danrl/proto-wireguard