Allow escaped backslashes in features
Merge branch 'new-parser' into new-parser-mail-steps