Fixes gh-1767
Fixes gh-2071
Closes gh-2180

(cherry picked from commit 86419b10bfa5e3b71a7d416288ab806d47a31d1f)

Conflicts:
	src/css.js
	src/css/defaultDisplay.js
	src/effects.js
	test/data/testsuite.css
	test/unit/css.js
	test/unit/effects.js