Merge pull request #2208 from NelleV/MEP10_annotate

DOC annotate is now in numpydoc format