Merge pull request #3386 from bobafetthotmail/patch-12