"Fixes the cms/components" documentation page
Merge remote-tracking branch 'upstream/master'