haddock
Merge branch 'master' into answers