docscrape: fixes from SciPy#576

larsoner merged 2 commits intonumpy:mainnumpy/numpydoc:mainfrom

lucascolley:scipy-fixeslucascolley/numpydoc:scipy-fixesCopy head branch name to clipboard