Submit Nick's patch for issue 3589, reviewed by jnoller
4 files changed