[O] Two patches I have been using for 6-12 months

[Bernt Hansen]

Hi Bastien,

Attached are two patches I use on top of master.  I have been using these
for 6-12 months so I consider them to be well tested.

Please consider including these in the code base.

Thanks,
Bernt