Adjust version check.
Merge pull request #2233 from jburel/rebased/develop/client-server-version

Adjust version check. (rebased onto develop)