Merge pull request #2711 from dago/kstat