Version info added to file.txt
Merge branch 'master' into devel