Rebasing merge to junio/next (9c3410c)