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

(Using an -s ours merge for Not taking the CVE-2012-2250 fix from
maint-0.2.3; it would conflict.)