Merge pull request #3385 from bobafetthotmail/patch-11