Merge branch 'master' into sumpy-timing-future-fix-waiting