Fix for issue 1627952
2 files changed