Merge commit 'afc12191fd0a164aa50f92434ddf0fb509fc972c' * commit 'afc12191fd0a164aa50f92434ddf0fb509fc972c': docs only.