Merge "dh" branch from: The "gen_dh_params" script is no longer necessary