Merge branch 'master' into cabal-library

Conflicts:
	idris.cabal