Merge commit '60d4c09c982a1c562a70cd6aa705f47ab3badcfb' from company

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

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

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

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

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

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

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

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

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

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

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