Merge tag 'v2.14.1' 251/head
authorJunio C Hamano <gitster@pobox.com>
Fri, 4 Aug 2017 19:45:17 +0000 (12:45 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 4 Aug 2017 19:45:17 +0000 (12:45 -0700)

Trivial merge