Sync with master
authorJunio C Hamano <gitster@pobox.com>
Mon, 17 Apr 2017 06:38:53 +0000 (23:38 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 17 Apr 2017 06:38:53 +0000 (23:38 -0700)
commit2cccc8116438182c988c7f26d9559a1c22e78f1c
treee3a88b436b09a183d43f8234047c26d2b6bd691a
parentb2f51f0780030c231e555af15a564f44cf0e98ac
parent584f8975d2d9530a34bd0b936ae774f82fe30fed
Sync with master

* master:
  Twelfth batch for 2.13