public marks

PUBLIC MARKS from julien.c with tags mort & bunpei