Merge commit '54161d143931c5be2d49e8f9f215ec8bff2237af' into eclair * commit '54161d143931c5be2d49e8f9f215ec8bff2237af': DOCS ONLY.
Merge commit '54161d143931c5be2d49e8f9f215ec8bff2237af' into eclair * commit '54161d143931c5be2d49e8f9f215ec8bff2237af': DOCS ONLY.