cleanup
Merge remote-tracking branch 'origin/4.0-wip' into psi4