Merge pull request #2495 from cshore/pull-request-vpnc-auth-fail