Adjust version check.
Merge pull request #2226 from jburel/client-server-version

Adjust version check.