another hotfix from play-git
Merge branch 'hotfix'

Conflicts:
	playground.txt