merge with Eliot 936, to mark the start of 64bits work.
lots of conflicts, etc. but I succeed on having a working version :)