Sync with 'maint'
authorJunio C Hamano <gitster@pobox.com>
Thu, 16 Mar 2017 21:03:11 +0000 (14:03 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 16 Mar 2017 21:03:11 +0000 (14:03 -0700)
* maint:
Preparing for 2.12.1

Trivial merge