Forgot to update compat matrix
Merge branch 'master' into dev