Merge pull request #299 from nmav/ocserv-match