Allow x-match header to be missing.
Merged bug25545 into stable
Merged stable into default