[xmltv/f33] (2 commits) ...update to recent upstream patches