Merge branch 'mru/quilt'