Fix sort-by-schedule, natural order for sessions
Merge branch 'v1.2'