use epochs.xml
use epochs.xml
use epochs by default, but accept epoch as well
rephrase slightly the warning
Merge branch 'mff_epochs'