Merge commit '7c14dedc79bf0c6eaad5bf50b80ea80dd721afdc' from company

Conflicts:
	packages/company/company-pysmell.el

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-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-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-keywords.el
Simple merge

diff --cc packages/company/company-pysmell.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-tests.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