See #819. Adding patch files to repo.