Merge pull request #1829 from StephenMcConnel/bug-30325