directoy -> directory
Merge branch '2.11' into 3.0