merge trellis branch changes into trunk

No match.