Merge pull request #3392 from bobafetthotmail/patch-18