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