Merge commit '2ef6263c65a109b4d36503e6484fdbf4cb307d0f' from company

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

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

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

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

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