Merge pull request #600 from danvk/558-fill-artifacts