directoy -> directory
Merge branch '2.11' into 3.0
Merge remote-tracking branch 'upstream/3.0' into 3.0-ja.