More perfected SVG template
Merge branch 'master' into unstable