hexylena Merge pull request #3105 from abretaud/annotypos