2685d3b85b
Merge commit 'ba52b3e08b33592457242944f7a89691a5b94880' into eclair * commit 'ba52b3e08b33592457242944f7a89691a5b94880': DOCS ONLY.