Merge pull request #8433 from hnyman/vpnc