Merge branch 'sched_meta_update_fix' of github.com:esheffield/qonos into sched_meta_update_fix