Merge pull request #1322 from StephenMcConnel/bug23532