832134 - making description search more consistent
merge conflict
Merge pull request #1435 from jlsherrill/832134

832134 - making description search more consistent