Merge branch 'master' into fixes

We have a fix to apply on top of commit 96d4f267 ("Remove 'type'
argument from access_ok() function"), so merge master to get it.