Merge branch 'master' into merge-2.062.

Conflicts:
	runtime/druntime
This commit is contained in:
David Nadlinger
2013-03-12 00:02:27 +01:00