Merge commit '7be4321260f0c73ef4c3cadc646f6bb496650253' from company

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

diff --cc packages/company/company-bbdb.el
index 0000000000000000000000000000000000000000,8e4705f73910437c958d04e50d5a659c42def25b..8e4705f73910437c958d04e50d5a659c42def25b
mode 000000,100644..100644
--- /dev/null
--- 2/company-bbdb.el
+++ b/packages/company/company-bbdb.el

diff --cc packages/company/company-keywords.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-yasnippet.el
index 0000000000000000000000000000000000000000,ae370c78feca440e0eb64cc024604e3fd88fb111..ae370c78feca440e0eb64cc024604e3fd88fb111
mode 000000,100644..100644
--- /dev/null
--- 2/company-yasnippet.el
+++ b/packages/company/company-yasnippet.el

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