Merge commit '04680858a0671ad615f088edeea87b61ea243f24' into eclair * commit '04680858a0671ad615f088edeea87b61ea243f24': docs only.
Merge commit '04680858a0671ad615f088edeea87b61ea243f24' into eclair * commit '04680858a0671ad615f088edeea87b61ea243f24': docs only.