Updates from Philippe Houdoin.
5 files changed