Merge branch 'bug_713_fix_timerlist_sort' into experimental