Merge branch 'master' into uhc-backend

Conflicts:
	src/full/Agda/Interaction/Options.hs
	src/full/Agda/TypeChecking/Monad/Builtin.hs