Documentation: last piace of Michael Clement's review
Merge remote-tracking branch 'mc/master'