Fix #4086
2 files changed