Fix highlighting issue when using phrase query with OR operator
Merge pull request #336 from emmanuel-keller/1.5

Fix highlighting issue when using phrase query with OR operator