Sync from company/master

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

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

diff --cc packages/company/company-cmake.el
index 0000000000000000000000000000000000000000,0c96eb676a70e508d85b1472a1f8dd2b91d7df08..0c96eb676a70e508d85b1472a1f8dd2b91d7df08
mode 000000,100644..100644
--- /dev/null
--- 2/company-cmake.el
+++ b/packages/company/company-cmake.el

diff --cc packages/company/company-eclim.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.el
Simple merge