incremental-search
Merge branch 'master' into mac