Sync with master
authorJunio C Hamano <gitster@pobox.com>
Mon, 13 Mar 2017 06:25:40 +0000 (23:25 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 13 Mar 2017 06:25:40 +0000 (23:25 -0700)
commit23dc2f6d3cd0230fcc0aabcb98a39cbef9ded585
treefd2d5b27fb689fb18cb326d20d8415e9245bebff
parent8fd4bf325aff58c91fc2c04afe139ba88aaed819
parentd6db3f216544d05e09159756812ccbcb16861d71
Sync with master

* master:
  Third batch after 2.12