Merge pull request #3441 from bobafetthotmail/patch-3