Merge commit 'b6b25d63df8dd873c60ab056e5b0e0eda167cfb1' into eclair * commit 'b6b25d63df8dd873c60ab056e5b0e0eda167cfb1': docs only.
Merge commit 'b6b25d63df8dd873c60ab056e5b0e0eda167cfb1' into eclair * commit 'b6b25d63df8dd873c60ab056e5b0e0eda167cfb1': docs only.