Merge branch 'jk/lib-proto-disable-cleanup' into maint-2.12

Junio C Hamano committed Jul 30, 2017 at 15:03 UTC 9315f271e3fffd1e60b23052c29704923da5837a

No changes.