Code

Merge branch 'nd/diffstat-gramnum' into maint