public marks

PUBLIC MARKS from nhoizey with tags Mac_OS_X & bug