Merge latest SSH.NET changes from upstream