En commit till master
Merge branch 'master' into 1.0

Conflicts:
	fil.txt