[xmltv/f29] (2 commits) ...Pull in upstream patches to resolve grabber issues