Merge pull request #380 from apache/geertjanw-patch-14

More content for 11.1 features page