hotfix for monkey and playground.
Another hotfix for playground.
Merge branch 'master' into hotfix
Merge branch 'master' into hotfix

Conflicts:
	playground.txt