Merged Michel Salim's patch. Thanks!

No match.