Restore code to build from .hsc source files
Merge remote-tracking branch 'anchor/master'
Minor haddock fixes