Merge branch 'qed-next'