Merge pull request #3443 from bobafetthotmail/patch-7