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