instserver.patch - sync with upstream
Merge pull request #596 from lslezak/instserver_sync

instserver.patch - sync with upstream