Merge branch 'maint'

Junio C Hamano committed Jan 17, 2017 at 15:20 UTC 733671b0fd2fb03edb05273f36ec70bd624e544f

No changes.