Merge pull request #1015 from danrl/proto-wireguard