Merge branch 'master' of /tmp/ghc-garrows; branch 'master' of http://git.megacz.com...