Rebasing merge to junio/next (7fd54b9)