Fix issue with muting.
Merge branch 'hotfix/0.8.5'
Merge tag '0.8.5' into develop

0.8.5

Conflicts:
	bower.json
	package.json