Merge branch 'akagogo_svg' into genete_master