Upstream fixes, including stroke dash and IE9 workaround.

Also some whitespace fixes.