These two patches look good to me (not verified locally, but if it 
builds for you it should build for everyone).

Greetings,
Maxime (not a committer, though I do some reviewing)