pull Thierry's latest into my repo

At least that is what I think will happen:)