Rebasing merge to junio/next (b5778e1)