sync with upstream, added patch for: Apply changes to match.c to sync with recmatch from util.c
use stable release instead, as 6.10 is still under beta