cleanup
Merge branch 'master' into playground/svg