Fixes gh-1711
Closes gh-2011

(cherry picked from commit 9b03f6df88a8d9dbda3f7893cdd84e3a3c70da17)

Conflicts:
	src/css.js
	src/effects.js