Merge pull request #1851 from daniel-honestempire/develop

DRY determining server protocol