Fixes for the renego-option merge
2 files changed