Merge pull request #1522 from StephenMcConnel/bug-26258