trunk-master
bug fix in branch
Merge branch 'bug-fix'

Conflicts:
	afile.txt