first changes that should fix the gui_epoching problem
Merge branch 'master' into fix_epoching_gui