latest stable upstream
reference most, jed, xjed and rgrep.
Fix for FL-2912