Merge pull request #1303 from auouymous/setting-to-disable-find-as-you-type