Add fix of branch michel_190 for OS X