Restore Directory constructor inheritance, adds debugging convenience
Merge remote-tracking branch 'origin/master'