Sync with maint
authorJunio C Hamano <gitster@pobox.com>
Tue, 15 Dec 2015 17:45:06 +0000 (09:45 -0800)
committerJunio C Hamano <gitster@pobox.com>
Tue, 15 Dec 2015 17:45:16 +0000 (09:45 -0800)

Trivial merge