Built from 84a849d on branch svg-muck