Code

Merge branch 'jc/maint-diffstat-numstat-context'