Fix wrong directory name
Merge branch 'master' into phantom0.2