Merge branch 'image-type-getter-and-setter'

Conflicts:
	canvas.go