Closes gh-2340

(cherry picked from commit b3b2d6c3dd51fbdc69e1942e9af75cc99a1834c2)

Conflicts:
	src/effects.js