Merge commit '96b7f921a5aea4264af1e0b4970263a3135c04d0' into eclair * commit '96b7f921a5aea4264af1e0b4970263a3135c04d0': docs only.
Merge commit '96b7f921a5aea4264af1e0b4970263a3135c04d0' into eclair * commit '96b7f921a5aea4264af1e0b4970263a3135c04d0': docs only.