2.11.0-M8
Merge pull request #160 from adriaanm/2.11.0-M8

2.11.0-M8