Merge commit '67ab56a5469f16652e73667ec3b4f76ff6befee6' from company

diff --cc packages/company/NEWS.md
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-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-etags.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