Sync with maint
authorJunio C Hamano <gitster@pobox.com>
Wed, 4 Nov 2015 22:21:41 +0000 (14:21 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 4 Nov 2015 22:21:41 +0000 (14:21 -0800)
* maint:

Trivial merge