Merge branch 'master' into netbsd-support