bug#65132: ...

Patch applied in 1e3b5390e3c24e66013118e9751db4de5025a4a2. Thanks, Daniel

bug#40584: ...

Patch applied in 3243d96bb5b9658f08847a7073fe6c0b2ccab6be. Thanks, Daniel