Merge branch 'quilt/rr'