Merge commit '212c8fc3101781a2f1c55ca61772eb75a2046e87' from company

diff --cc packages/company/.travis.yml
Simple merge

diff --cc packages/company/Makefile
Simple merge

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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