Merge with upstream.
Reninstalled AuCTeX.