add config.canvas.doctype. ("edge","loose","strict","quirks")
Merge remote branch 'origin/master'