Give more information in search results
Merge remote-tracking branch 'github/master'