Merge pull request #3383 from bobafetthotmail/patch-10