MatchTagAlways accepted my pull request, so back to the upstream repo