Resize canvas when required.
Merge branch '0.10.x'

Conflicts:
	js/feature-draw.js