Built from ed0ef04 on branch svg-muck