Merge branch 'nd/diffstat-gramnum'