public marks

PUBLIC MARKS from mfaure with tags gitlab & "git flow"