Sync with maint
commit8f60064c1f538f06e1c579cbd9840b86b10bcd3d
authorJunio C Hamano <gitster@pobox.com>
Tue, 31 Jan 2017 21:34:59 +0000 (31 13:34 -0800)
committerJunio C Hamano <gitster@pobox.com>
Tue, 31 Jan 2017 21:34:59 +0000 (31 13:34 -0800)
tree52060094c97b5ecff0a60e738c858dc8079fc01a
parent3c4ce8e69b4838efce72d090b85bbbbb6eacc5bc
parentb32fe956d0d8d601e2dc915d96e14d8bbdda6b71
Sync with maint

* maint:
  Ready for 2.11.1