Merge commit 'eb0d8d9e687e1364098f9abc6f9281fcbc0d3abd' from company

diff --cc packages/company/.elpaignore
index 0000000000000000000000000000000000000000,9f31d8a765cf08a222f29fd6ba49568096795be8..9f31d8a765cf08a222f29fd6ba49568096795be8
mode 000000,100644..100644
--- /dev/null
--- 2/.elpaignore
+++ b/packages/company/.elpaignore

diff --cc packages/company/Makefile
Simple merge

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

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

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

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

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

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

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

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

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

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

diff --cc packages/company/test/all.el
index 0000000000000000000000000000000000000000,6d64a62207327059ccbeae2606607046740aa9d3..6d64a62207327059ccbeae2606607046740aa9d3
mode 000000,100644..100644
--- /dev/null
--- 2/test/all.el
+++ b/packages/company/test/all.el

diff --cc packages/company/test/async-tests.el
index 0000000000000000000000000000000000000000,5d8be3e837372f07c42b038467680f9aad920607..5d8be3e837372f07c42b038467680f9aad920607
mode 000000,100644..100644
--- /dev/null
--- 2/test/async-tests.el
+++ b/packages/company/test/async-tests.el

diff --cc packages/company/test/clang-tests.el
index 0000000000000000000000000000000000000000,c8c03b7802140c65c18e6a952dec841620dc45e5..c8c03b7802140c65c18e6a952dec841620dc45e5
mode 000000,100644..100644
--- /dev/null
--- 2/test/clang-tests.el
+++ b/packages/company/test/clang-tests.el

diff --cc packages/company/test/core-tests.el
index 0000000000000000000000000000000000000000,13e547e3d36b15ac566ad3dcc9119ea675a7c580..13e547e3d36b15ac566ad3dcc9119ea675a7c580
mode 000000,100644..100644
--- /dev/null
--- 2/test/core-tests.el
+++ b/packages/company/test/core-tests.el

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

diff --cc packages/company/test/frontends-tests.el
index 0000000000000000000000000000000000000000,a10f91461f2c6ef2a4e65640ef97c8a08a8091d7..a10f91461f2c6ef2a4e65640ef97c8a08a8091d7
mode 000000,100644..100644
--- /dev/null
--- 2/test/frontends-tests.el
+++ b/packages/company/test/frontends-tests.el

diff --cc packages/company/test/keywords-tests.el
index 0000000000000000000000000000000000000000,05843b26aa981e6de7c0c45190be2ed5be7b294a..05843b26aa981e6de7c0c45190be2ed5be7b294a
mode 000000,100644..100644
--- /dev/null
--- 2/test/keywords-tests.el
+++ b/packages/company/test/keywords-tests.el

diff --cc packages/company/test/template-tests.el
index 0000000000000000000000000000000000000000,09548c4234e857c05098bfd81fc8584583ee5e35..09548c4234e857c05098bfd81fc8584583ee5e35
mode 000000,100644..100644
--- /dev/null
--- 2/test/template-tests.el
+++ b/packages/company/test/template-tests.el

diff --cc packages/company/test/transformers-tests.el
index 0000000000000000000000000000000000000000,4d027e5d55360ee6abf9e377b8e6458dec8ff4ea..4d027e5d55360ee6abf9e377b8e6458dec8ff4ea
mode 000000,100644..100644
--- /dev/null
--- 2/test/transformers-tests.el
+++ b/packages/company/test/transformers-tests.el