CtrlP always looks in root dir
CtrlP always looks in root dir
Merge branch 'master' into edge