Writing tests for 1.11
Merge tag '1.11' into OO