Sync with master
authorJunio C Hamano <gitster@pobox.com>
Fri, 16 Dec 2016 23:33:23 +0000 (15:33 -0800)
committerJunio C Hamano <gitster@pobox.com>
Fri, 16 Dec 2016 23:33:23 +0000 (15:33 -0800)
commitf8bf8f2a7b2b08001fdf3e1c554eef9249e47c19
treeb53e5d2ce6415e348a7b64af655be821773d26dd
parent06d0b0fbfdb20ef7cbcd2493d4c1e9aaa23360a5
parenteff96d7e16a769dca9b0319ccf460a83f514676e
Sync with master

* master:
  First batch for 2.12