Merge pull request #404 from apache/geertjanw-patch-13

Adding note in 11.0 about 11.1