public marks

PUBLIC MARKS from mfaure with tags git & "rewriting git history"