r2 TestDoc changes
Merge branch 'master' into r2_TestDoc
best feature evar
resolved merge conflict
Merge branch 'r2_TestDoc'