Merging some old stuff into the latest Trellis kernel.