Merge branch 'master' into max-sticky-agenda