Merge pull request #1323 from StephenMcConnel/bug-23591