Merging 3.1.2 from PSI into conda branch

Simon Roserequested to merge
3_1_2_psi into conda

This change updates the conda branch to be consistent with the version of require in use at PSI.

Merge request reports