pre merge with branch
Merge branch 'tempdirtests'

Conflicts:
	file2.py
m0 change
t0 change
Merge branch 'master' into tempdirtests

Conflicts:
	file2.py
t1 change