Merge pull request #2716 from dago/kstat