generator:sort value in OnCalendar
Merge branch 'master' into debian