Compat with new kstat's.
Should work with old ones too.
Merge branch 'test' into dev