Merge pull request #1564 from hauke/kismet