Rebasing merge to junio/maint (8a90438)