Merge pull request #3379 from bobafetthotmail/patch-3