Merge pull request #5968 from jkarni/jkarni/servant-server-0.2.3

I'll merge blindly, assuming that those changes have been tested by the submitter. If these updates cause any trouble, please don't hesitate to revoke if necessary.