branch dirtest
some changes
Merge branch 'master' into tempdirtests