use the configured directory mode
Merge remote-tracking branch 'accretive/master'