caret
merge caret

Conflicts:
	web/static/canvas.js