added again.
Merge branch 'version-3.4' of https://github.com/mj2010/MJTest201305 into version-3.4

Conflicts:
	testfile.txt.txt