Merge branch '1.8.0' into 1.8.1
[monky] / extras /
drwxr-xr-x   ..
drwxr-xr-x - nano
drwxr-xr-x - vim