Explorer effects cleanup
Merge remote-tracking branch 'origin/dev' into dev

Conflicts:
	demos/explorer effects.html