Merge commit 'a4ac0dead8e9cb440c1f8aec9141d6c64bad4933' from company

diff --cc packages/company/NEWS.md
Simple merge

diff --cc packages/company/company-ispell.el
Simple merge

diff --cc packages/company/company.el
Simple merge

diff --cc packages/company/test/frontends-tests.el
Simple merge