Merge remote-tracking branch 'origin/maint-0.2.3'

This is an "ours" commit ; I'm merging a separate version of the
block-renegotiate patch into 0.2.4.