Sync with maint
authorJunio C Hamano <gitster@pobox.com>
Tue, 3 Nov 2015 23:41:50 +0000 (15:41 -0800)
committerJunio C Hamano <gitster@pobox.com>
Tue, 3 Nov 2015 23:41:50 +0000 (15:41 -0800)
Trivial merge