Merge remote-tracking branch 'remotes/upstream/release'

Conflicts:
	src/drawing.js
	src/text.js