directoy -> directory
Merge branch '2.11' into 3.0
Merge branch '3.0' into 3.1