Merge branch 'jk/diffstat-binary' into maint