public marks

PUBLIC MARKS from tadeufilippini with tags gutsy-backports & "jesus mercy"