Fix context forgetting universes (temporary, the fix is not exactly right).
Fix coqc -time (Closes: 3201)
MSWin Fixes

Conflicts:
	configure