ba14fff7fd
Merge commit '122426780008b9920a15798f1a2bb210779b5a9d' into eclair * commit '122426780008b9920a15798f1a2bb210779b5a9d': docs only.