Sync with maint
authorJunio C Hamano <gitster@pobox.com>
Fri, 9 Sep 2016 05:00:53 +0000 (22:00 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 9 Sep 2016 05:00:53 +0000 (22:00 -0700)
* maint:
Prepare for 2.9.4

Trivial merge