Sync with 2.7.1
authorJunio C Hamano <gitster@pobox.com>
Fri, 5 Feb 2016 23:24:02 +0000 (15:24 -0800)
committerJunio C Hamano <gitster@pobox.com>
Fri, 5 Feb 2016 23:24:02 +0000 (15:24 -0800)
Trivial merge