changes
Merge branch 'master' into r2_index
stop everything. Remove branches. Start over