Merge pull request #980 from StephenMcConnel/bug-18638