Fix $LESS. Long options are not working.
Merge branch 'master' into leo-work