diagrams-haddock filename scheme has changed
Merge branch 'master' into expand
Updated for diagrams-haddock changes.