Fixed typing (#151)
Merge branch '2.11' into 3.0