Fixes gh-1747
Closes gh-2203

(cherry picked from commit 225bde37c997f5ddd9fe00fdfb8e9a43545cfbbc)

Conflicts:
	src/manipulation.js
	test/unit/manipulation.js