Merge commit '60d8b78041e7b520e1f42b6419f5ab9b5fc1851b' into eclair * commit '60d8b78041e7b520e1f42b6419f5ab9b5fc1851b': docs only.
Merge commit '60d8b78041e7b520e1f42b6419f5ab9b5fc1851b' into eclair * commit '60d8b78041e7b520e1f42b6419f5ab9b5fc1851b': docs only.