r1 and r2

r1
r2
r1 edit
r2 edits
Merge branch 'mid'