Delete test.txt
Merge branch 'master' into generic_configure_script