Merge branches 'hammer2' and 'master' of ssh://crater.dragonflybsd.org/repository...