2.11.0-M3

Review by @adriaanm