Merge pull request #455 from hnyman/backport-stats