Merge pull request #3429 from brianjmurrell/patch-3