Merge pull request #6507 from kenkeys/spoofer-133