Rebasing merge to junio/maint (1b6ecba)