companion to cyclus/cyclus#628.
Merge remote-tracking branch 'upstream/develop' into integration_testing