Merged Michel Salim's patch. Thanks!