Merge branch 'predator_parameter_fixes' into hydro-devel