Bugfix: walk over rootfiles with depth larger than one
Merge branch 'master' into no_batch