Fix #4844
2 files changed