Add back the full less package, but use a newer version.
Merge remote-tracking branch 'origin/bootstrap' into bootstrap