handle case where EDIFF not listed explicitly in older run
Merge branch 'master' into aqueous_compatibility