Removed hardcoded SVG class, replaced with configurable one
Merge remote-tracking branch 'upstream/master'