Merge from erc--emacs--21