fix haddock comments in doctests
Merge branch 'master' into answers