Performance optimizations
Fix tests
Work around VML's `clearRect` bug
Merge remote-tracking branch 'upstream/master'