Sync with master
authorJunio C Hamano <gitster@pobox.com>
Tue, 14 Mar 2017 22:37:42 +0000 (15:37 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 14 Mar 2017 22:37:42 +0000 (15:37 -0700)
commit48829862c7ec047bdce13a3e5d758eb4d703d5b8
treedc9ba46191126d1f26975490d97f66606813b3e9
parentce43b4a309acff55243e04ecf28675b76a08ef72
parent4a9b9b32d47212e4ea43cd1fa3c11afef6d4c491
Sync with master

* master:
  Fourth batch after 2.12