companion to cyclus/cyclus#861
Merge branch 'gidden-rbptr' into develop