Merge commit '4d484a823d336ea587e37508fe73178d711dcdca' into eclair * commit '4d484a823d336ea587e37508fe73178d711dcdca': docs only.
Merge commit '4d484a823d336ea587e37508fe73178d711dcdca' into eclair * commit '4d484a823d336ea587e37508fe73178d711dcdca': docs only.