Merge branch 'master' of git://crater.dragonflybsd.org/dragonfly