Include Setup.hs
Merge branch 'master' into cleanup