Merge branch 'master' of https://github.com/edwinb/Idris-dev
Merge branch 'master' of https://github.com/chetant/Idris-dev