Hotfix for 0.4.7
Merge branch 'hotfix/0.4.7'
Merge tag '0.4.7' into develop

0.4.7

Conflicts:
	composer.json